diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
index cbcfec8c2..9b4b31a79 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
@@ -1828,8 +1828,8 @@ public static void setSourceContactImage(   String contactString,
 
         // If we find that the contact is actually a number, we get rid of the
         // @ if it exists.
-        if (StringUtils.isNumber(contactString)
-            && atIndex >= 0)
+        if (atIndex >= 0
+            && StringUtils.isNumber(contactString.substring(0, atIndex)))
         {
             contactString = contactString.substring(0, atIndex);
         }