diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index 783bf0e7d..8e5f61788 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -1022,6 +1022,9 @@ private String processKeyword(  String message,
                                     String contentType,
                                     String keyword)
     {
+        if(message == null)
+            return message;
+
         Matcher m
             = Pattern.compile(Pattern.quote(keyword), Pattern.CASE_INSENSITIVE)
                 .matcher(message);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 9107fc9b8..24b516b7d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -734,7 +734,8 @@ else if(o instanceof ChatRoomMessageDeliveredEvent)
                             evt.getTimestamp(),
                             Chat.HISTORY_OUTGOING_MESSAGE,
                             evt.getMessage().getContent(),
-                            evt.getMessage().getContentType());
+                            evt.getMessage().getContentType(),
+                            evt.getMessage().getMessageUID());
             }
             else if(o instanceof ChatRoomMessageReceivedEvent)
             {
@@ -750,7 +751,8 @@ else if(o instanceof ChatRoomMessageReceivedEvent)
                             evt.getTimestamp(),
                             Chat.HISTORY_INCOMING_MESSAGE,
                             evt.getMessage().getContent(),
-                            evt.getMessage().getContentType());
+                            evt.getMessage().getContentType(),
+                            evt.getMessage().getMessageUID());
                 }
             }
             else if (o instanceof FileRecord)
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
index f163dab57..f02dd3b8f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
@@ -179,10 +179,13 @@ public void messageDelivered(ChatRoomMessageDeliveredEvent evt)
 
             chatPanel.addMessage(
                 sourceChatRoom.getUserNickname(),
+                null,
                 evt.getTimestamp(),
                 messageType,
                 msg.getContent(),
-                msg.getContentType());
+                msg.getContentType(),
+                msg.getMessageUID(),
+                null);
         }
     }
 
@@ -287,10 +290,13 @@ else if(o instanceof ChatRoomMessageReceivedEvent)
 
         chatPanel.addMessage(
             sourceMember.getName(),
+            null,
             evt.getTimestamp(),
             messageType,
             messageContent,
-            message.getContentType());
+            message.getContentType(),
+            message.getMessageUID(),
+            null);
 
         chatWindowManager.openChat(chatPanel, false);
     }
@@ -1956,10 +1962,13 @@ public void messageDelivered(AdHocChatRoomMessageDeliveredEvent evt)
                 .addMessage(
                     sourceChatRoom
                         .getParentProvider().getAccountID().getUserID(),
+                    null,
                     evt.getTimestamp(),
                     messageType,
                     msg.getContent(),
-                    msg.getContentType());
+                    msg.getContentType(),
+                    msg.getMessageUID(),
+                    null);
         }
         else
         {
@@ -2078,10 +2087,13 @@ public void messageReceived(AdHocChatRoomMessageReceivedEvent evt)
 
         chatPanel.addMessage(
             sourceParticipant.getDisplayName(),
+            null,
             evt.getTimestamp(),
             messageType,
             messageContent,
-            message.getContentType());
+            message.getContentType(),
+            message.getMessageUID(),
+            null);
 
         chatWindowManager.openChat(chatPanel, false);
     }
diff --git a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
index 87a8e2c33..82791dc14 100644
--- a/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java
@@ -1922,7 +1922,7 @@ public void progressChanged(ProgressEvent evt)
         /**
          * Calculates the progress according the count of the records
          * we will search
-         * @param historyProgress int
+         * @param evt the progress event
          * @return int
          */
         private int getProgressMapping(ProgressEvent evt)