diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
index a98a22cae..7729d89fd 100644
--- a/src/mod_admin_extra.erl
+++ b/src/mod_admin_extra.erl
@@ -1406,10 +1406,9 @@ send_packet_all_resources(FromJID, ToU, ToS, ToR, Packet) ->
     ejabberd_router:route(FromJID, ToJID, Packet).
 
 build_packet(Type, Subject, Body) ->
-    Tail = case Subject of
-	<<"chat">> -> [];
-	_ -> [{xmlel, <<"subject">>, [], [{xmlcdata, Subject}]}]
-    end,
+    Tail = if Subject == <<"">>; Type == <<"chat">> -> [];
+	      true -> [{xmlel, <<"subject">>, [], [{xmlcdata, Subject}]}]
+	   end,
     {xmlel, <<"message">>,
      [{<<"type">>, Type}, {<<"id">>, randoms:get_string()}],
      [{xmlel, <<"body">>, [], [{xmlcdata, Body}]} | Tail]