1 files changed, 8 insertions, 1 deletions

diff --git a/Presence/Stanza/Parse.hs b/Presence/Stanza/Parse.hs
index b025f418..58bf7c51 100644
--- a/Presence/Stanza/Parse.hs
+++ b/Presence/Stanza/Parse.hs
@@ -227,9 +227,16 @@ parseMessage ns stanza = do
                                   , Map.empty )
     return Message {
         msgLangMap = Map.toList langmap,
-        msgThread = if msgThreadContent th/="" then Just th else Nothing
+        msgThread  = if msgThreadContent th/="" then Just th else Nothing,
+        msgType    = parseMessageType $ lookupAttrib "type" (tagAttrs stanza)
     }
 
+parseMessageType :: Maybe Text -> MessageType
+parseMessageType (Just "chat")      = ChatMsg
+parseMessageType (Just "groupchat") = GroupChatMsg
+parseMessageType (Just "headline")  = HeadlineMsg
+parseMessageType _                  = NormalMsg
+
 findErrorTag :: Monad m => Text -> NestingXML o m (Maybe StanzaError)
 findErrorTag ns = do
     x <- nextElement