--- a/cmd.c	Sat Dec 26 01:46:10 2009 +0200
+++ b/cmd.c	Sat Dec 26 02:00:19 2009 +0200
@@ -273,7 +273,7 @@
 			cmd_cb_t *cb = g_new (cmd_cb_t, 1);
 
 			if (settings_opt_get_int ("cmd_header")) {
-				if (is_room (jid)) {
+				if (settings_opt_get_int ("cmd_header_inline") || is_room (jid)) {
 					gchar *mesg = g_strdup_printf ("$ %s", arg);
 					gchar *utf  = to_utf8 (mesg);
 					g_free (mesg);