diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
index b277891c4..715efdca4 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
@@ -261,7 +261,7 @@ public void removeChat(ChatPanel chatPanel)
         }
 
     }
-    
+
     /**
      * Removes all tabs in the chat tabbed pane. If not in mode
      * TABBED_CHAT_WINDOW doesn nothing.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java
index 0849af0db..76c51b92d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java
@@ -321,11 +321,11 @@ public void loadChatRoom(ChatRoom chatRoom)
                 .addContact(chatContact);
         }
 
-        chatRoom.addPropertyChangeListener(this);        
+        chatRoom.addPropertyChangeListener(this);
         chatRoom.addMemberPresenceListener(this);
         
         // Load the subject of the chat room.
-        subjectPanel.setSubject(chatRoom.getSubject());        
+        subjectPanel.setSubject(chatRoom.getSubject());
     }
 
     /**