diff --git a/src/core/xmpp.py b/src/core/xmpp.py
index 0d9b3e55..a66dc402 100644
--- a/src/core/xmpp.py
+++ b/src/core/xmpp.py
@@ -126,7 +126,8 @@ class SatMessageProtocol(xmppim.MessageProtocol):
         for e in message.elements():
             if e.name == "body":
                 data['body'] = e.children[0] if e.children else ""
-                break
+            elif e.name == "subject" and e.children:
+                data['extra']['subject'] = e.children[0]
 
         data['type'] = message['type'] if message.hasAttribute('type') else 'normal'