diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactListPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactListPanel.java
index a0e57a428..bc7229117 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactListPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactListPanel.java
@@ -61,8 +61,6 @@ public ChatContactListPanel(ChatPanel chat)
         this.contactsPanel.setLayout(
             new BoxLayout(contactsPanel, BoxLayout.Y_AXIS));
 
-        //this.setMinimumSize(new Dimension(150, 100));
-
         this.contactsPanel.setLayout(new BoxLayout(this.contactsPanel,
                 BoxLayout.Y_AXIS));
 
@@ -144,7 +142,7 @@ public void removeContact(ChatContact chatContact)
             
             chatContacts.remove(chatContact);
             
-            chatContactPanel.removeMouseListener(this);            
+            chatContactPanel.removeMouseListener(this);
         }
     }
 
@@ -213,19 +211,19 @@ public void mousePressed(MouseEvent e)
             // Reduce all other chat contact panels before expanding the
             // selected one.
             Iterator chatContactPanels = chatContacts.values().iterator();
-            
+
             while(chatContactPanels.hasNext())
             {
                 ChatContactPanel panel
                     = (ChatContactPanel) chatContactPanels.next();
-                
+
                 panel.setSelected(false);
             }
-            
+
             ChatContactPanel chatContactPanel = (ChatContactPanel) e.getSource();
-            
+
             chatContactPanel.setSelected(true);
-            
+
             this.requestFocus();
         }
     }
@@ -240,7 +238,6 @@ public void keyTyped(KeyEvent e)
     
     public void keyPressed(KeyEvent e)
     {
-        
         if (e.getKeyCode() == KeyEvent.VK_DOWN)
         {
             Iterator contacts = chatContacts.keySet().iterator();
@@ -248,54 +245,53 @@ public void keyPressed(KeyEvent e)
             while(contacts.hasNext())
             {
                 ChatContact chatContact = (ChatContact) contacts.next();
-                
+
                 if(chatContact.isSelected())
-                {                    
+                {
                     if(contacts.hasNext())
                     {
                         ((ChatContactPanel) chatContacts.get(chatContact))
                             .setSelected(false);
-                    
+
                         ((ChatContactPanel) chatContacts.get(
                             contacts.next())).setSelected(true);
                     }
-                    
+
                     break;
-                }   
+                }
             }
         }
         else if (e.getKeyCode() == KeyEvent.VK_UP)
         {
             ChatContact previousChatContact = null;
-            
+
             Iterator contacts = chatContacts.keySet().iterator();
-            
+
             while(contacts.hasNext())
             {
                 ChatContact chatContact = (ChatContact) contacts.next();
-                
+
                 if(chatContact.isSelected())
                 {
                     if(previousChatContact != null)
                     {
                         ((ChatContactPanel) chatContacts.get(chatContact))
                             .setSelected(false);
-                    
+
                         ((ChatContactPanel) chatContacts.get(previousChatContact))
                             .setSelected(true);
-                    
                     }
-                    
+
                     break;
                 }
-                
+
                 previousChatContact = chatContact;
             }
         }
     }
 
     public void keyReleased(KeyEvent e)
-    {   
+    {
     }
 }
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactPanel.java
index 9397cb607..fdf7c04c2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactPanel.java
@@ -91,7 +91,6 @@ public ChatContactPanel(ChatPanel chatPanel, ChatContact contact)
         // menu.
         this.addMouseListener(this);
 
-        this.setPreferredSize(new Dimension(100, 55));
         this.mainPanel.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
 
         this.setOpaque(false);
@@ -324,15 +323,17 @@ public void setContactPhoto(ImageIcon contactPhoto)
     public void setSelected(boolean isSelected)
     {
         chatContact.setSelected(isSelected);
-        
+
         if(isSelected)
         {
+            this.setPreferredSize(new Dimension(145, 55));
             this.buttonsPanel.setVisible(true);
             this.mainPanel.revalidate();
             this.mainPanel.repaint();
         }
         else
         {
+            this.setPreferredSize(new Dimension(145, 25));
             this.buttonsPanel.setVisible(false);
             this.mainPanel.revalidate();
             this.mainPanel.repaint();
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 a8f5afff8..177125df0 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
@@ -98,8 +98,8 @@ public ChatPanel(ChatWindow chatWindow)
 
         this.topSplitPane.setResizeWeight(1.0D);
         this.messagePane.setResizeWeight(1.0D);
-        this.chatContactListPanel.setPreferredSize(new Dimension(120, 100));
-        this.chatContactListPanel.setMinimumSize(new Dimension(120, 100));
+        this.chatContactListPanel.setPreferredSize(new Dimension(150, 100));
+        this.chatContactListPanel.setMinimumSize(new Dimension(150, 100));
         this.writeMessagePanel.setPreferredSize(new Dimension(500, 100));
         this.writeMessagePanel.setMinimumSize(new Dimension(500, 100));
         this.conversationPanel.setPreferredSize(new Dimension(400, 200));