diff --git a/mbuni/mmlib/mms_mm7soap.c b/mbuni/mmlib/mms_mm7soap.c
index 7f7b33c..b4f51d7 100644
--- a/mbuni/mmlib/mms_mm7soap.c
+++ b/mbuni/mmlib/mms_mm7soap.c
@@ -376,7 +376,7 @@ static int append_address(Octstr *p, Octstr *addr_spec, char *prefix, int add_ty
      else 
 	  y = "";
      j = octstr_case_search(v, octstr_imm("/TYPE=PLMN"),0);
-     if (j >= 0) {
+     if (j >= 0 && octstr_search_char(v, '@', 0) < 0) { /* NO '@' */
 	  z = octstr_copy(v, 2, j-2); /* skip the initial char that is only for info purposes. */
 	  typ = octstr_len(z) <= 6 ? "ShortCode" : "Number";
      } else {