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 c3806f5e2..4ba08f65c 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
@@ -558,9 +558,14 @@ else if (messageType.equals(Chat.ERROR_MESSAGE))
                 + ImageLoader.getImageUri(ImageLoader.EXCLAMATION_MARK)
                 + "' </IMG>";
 
-            chatString += errorIcon
-                + messageTitle
-                + endHeaderTag + "<h5>" + message + "</h5>";
+            // If the message title is null do not show it and show the error
+            // icon on the same line as the actual error message.
+            if (messageTitle != null)
+                chatString += errorIcon + messageTitle + endHeaderTag
+                                + "<h5>" + message + "</h5>";
+            else
+                chatString += endHeaderTag
+                                + "<h5>" + errorIcon + " " + message + "</h5>";
         }
 
         return chatString;