--- a/cmd.c	Sat Dec 26 00:59:53 2009 +0200
+++ b/cmd.c	Sat Dec 26 01:46:10 2009 +0200
@@ -62,8 +62,14 @@
 		return FALSE;
 	}
 
-	if (!room)
-		hk_message_out (to, subject, 0, body, crypted, xep184);
+	if (!room) {
+		if (subject) {
+			gchar *hbody = g_strdup_printf ("[%s]\n%s", subject, body);
+			hk_message_out (to, NULL, 0, hbody, crypted, xep184);
+			g_free (hbody);
+		} else
+			hk_message_out (to, NULL, 0, body, crypted, xep184);
+	}
 
 	return TRUE;
 }