fix issue igniterealtime#19

Author: Simone Rossello

src/java/org/jivesoftware/openfire/archive/ArchiveInterceptor.java

@@ -77,7 +77,7 @@ public void interceptPacket(Packet packet, Session session, boolean incoming, bo
                         ConversationEventsQueue eventsQueue = conversationManager.getConversationEventsQueue();
                         eventsQueue.addChatEvent(conversationManager.getConversationKey(sender, receiver),
                                 ConversationEvent.chatMessageReceived(sender, receiver,
-                                        conversationManager.isMessageArchivingEnabled() ? message.getBody() : null,
+                                        conversationManager.isMessageArchivingEnabled() ? message.getBody() : null, message.toXML(),
                                         new Date()));
                     }
                 }

src/java/org/jivesoftware/openfire/archive/ConversationEvent.java

@@ -54,7 +54,7 @@ public ConversationEvent() {
 
     public void run(ConversationManager conversationManager) {
         if (Type.chatMessageReceived == type) {
-            conversationManager.processMessage(sender, receiver, body, "", date);
+            conversationManager.processMessage(sender, receiver, body, stanza, date);
         }
         else if (Type.roomDestroyed == type) {
             conversationManager.roomConversationEnded(roomJID, date);
@@ -135,12 +135,14 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
         }
     }
 
-    public static ConversationEvent chatMessageReceived(JID sender, JID receiver, String body, Date date) {
+    public static ConversationEvent chatMessageReceived(JID sender, JID receiver, String body,
+                                                        String stanza, Date date) {
         ConversationEvent event = new ConversationEvent();
         event.type = Type.chatMessageReceived;
         event.sender = sender;
         event.receiver = receiver;
         event.body = body;
+        event.stanza = stanza;
         event.date = date;
         return event;
     }

src/java/org/jivesoftware/openfire/archive/GroupConversationInterceptor.java

@@ -131,7 +131,7 @@ public void privateMessageRecieved(JID toJID, JID fromJID, Message message) {
                  ConversationEventsQueue eventsQueue = conversationManager.getConversationEventsQueue();
                  eventsQueue.addChatEvent(conversationManager.getConversationKey(fromJID, toJID),
                          ConversationEvent.chatMessageReceived(toJID, fromJID,
-                                 conversationManager.isMessageArchivingEnabled() ? message.getBody() : null,
+                                 conversationManager.isMessageArchivingEnabled() ? message.getBody() : null, message.toXML(),
                                  new Date()));
              }
          }