Just a little shorter code and only one input event... :[/b])
Code:
on *:input:*:{
  if /* !iswm $$1 && (# || $query($target)) {
    echo -ati $[,$me,] ) $1-
    .msg $ifmatch $1-
    haltdef
  }
}
on ^*:text:*:*:echo -mbflirt $iif(#,#,$nick) $+([,$nick,] ) $1- | halt }