diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 227745d6..d146eab8 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -765,22 +765,22 @@ msg_client(enum message_type msgtype,
 		sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
 				   target_p->name, target_p->user->away);
 
+	hdata.msgtype = msgtype;
+	hdata.source_p = source_p;
+	hdata.target_p = target_p;
+	hdata.text = text;
+	hdata.approved = 0;
+
+	call_hook(h_privmsg_user, &hdata);
+
+	/* buffer location may have changed. */
+	text = hdata.text;
+
+	if (hdata.approved != 0)
+		return;
+
 	if(MyClient(target_p))
 	{
-		hdata.msgtype = msgtype;
-		hdata.source_p = source_p;
-		hdata.target_p = target_p;
-		hdata.text = text;
-		hdata.approved = 0;
-
-		call_hook(h_privmsg_user, &hdata);
-
-		/* buffer location may have changed. */
-		text = hdata.text;
-
-		if (hdata.approved != 0)
-			return;
-
 		if (EmptyString(text))
 		{
 			/* could be empty after colour stripping and