diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ProtocolContactSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/message/ProtocolContactSelectorBox.java
index 90d0fc5d7..6da8b5a84 100644
--- a/src/net/java/sip/communicator/impl/gui/main/message/ProtocolContactSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/message/ProtocolContactSelectorBox.java
@@ -79,8 +79,7 @@ public void actionPerformed(ActionEvent e) {
 
                 chatPanel.setProtocolContact(protocolContact);
 
-                this.menu.setSelected(
-                    protocolContact, (ImageIcon)menuItem.getIcon());
+                this.setSelected(protocolContact, (ImageIcon)menuItem.getIcon());
 
                 return;
             }
@@ -145,16 +144,31 @@ public void updateContactStatus(Contact protoContact)
         }
     }
 
+    public void setSelected(Contact protoContact, ImageIcon icon)
+    {
+        this.menu.setSelected(protoContact, icon);
+        
+        String tooltipText;
+        
+        if(!protoContact.getDisplayName().equals(protoContact.getAddress()))
+            tooltipText = protoContact.getDisplayName()
+                + " (" + protoContact.getAddress() + ")";
+        else
+            tooltipText = protoContact.getDisplayName();
+        
+        this.menu.setToolTipText(tooltipText);
+    }
+    
     /**
      * Sets the selected contact to the given proto contact.
      * @param protoContact the proto contact to select
      */
     public void setSelected(Contact protoContact)
     {
-        this.menu.setSelected(protoContact,
-                new ImageIcon(createContactStatusImage(protoContact)));
+        this.setSelected(protoContact,
+                new ImageIcon(createContactStatusImage(protoContact)));        
     }
-
+    
     /**
      * Returns the protocol menu.
      *