1 files changed, 16 insertions, 6 deletions

diff --git a/Presence/Stanza/Build.hs b/Presence/Stanza/Build.hs
index e02684f5..16552428 100644
--- a/Presence/Stanza/Build.hs
+++ b/Presence/Stanza/Build.hs
@@ -19,24 +19,34 @@ import LockedChan
 import Stanza.Types
 
 makeMessage :: Text -> Text -> Text -> Text -> IO Stanza
-makeMessage namespace from to bod =
+makeMessage namespace from to bod = makeMessageEx namespace from to NormalMsg bod
+
+makeMessageEx :: Text -> Text -> Text -> MessageType -> Text -> IO Stanza
+makeMessageEx namespace from to msgtyp bod =
     stanzaFromList typ
      $ [ EventBeginElement (mkname namespace "message")
-            [ attr "from" from
-            , attr "to" to
-            ]
+            $ addMessageType msgtyp
+                [ attr "from" from
+                , attr "to" to
+                ]
        , EventBeginElement (mkname namespace "body") []
        , EventContent (ContentText bod)
        , EventEndElement (mkname namespace "body")
        , EventEndElement (mkname namespace "message") ]
  where
-    typ = Message { msgThread = Nothing
+    typ = Message { msgThread  = Nothing
                   , msgLangMap = [("", lsm)]
+                  , msgType    = msgtyp
                   }
     lsm = LangSpecificMessage
-            { msgBody = Just bod
+            { msgBody    = Just bod
             , msgSubject = Nothing }
 
+addMessageType ChatMsg      attrs = ("type",[ContentText "chat"]) : attrs
+addMessageType GroupChatMsg attrs = ("type",[ContentText "groupchat"]) : attrs
+addMessageType HeadlineMsg  attrs = ("type",[ContentText "headline"]) : attrs
+addMessageType _            attrs = attrs
+
 makeInformSubscription :: Text -> Text -> Text -> Bool -> IO Stanza
 makeInformSubscription namespace from to approved =
     stanzaFromList (PresenceInformSubscription approved)