diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 8eddf56..49f108f 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,6 @@
+2006-12-28 Paul A. Bagyenda <bagyenda@dsmagic.com>
+	* Removing '@' from transaction ID (thanks to Mario Noboa 
+	  <mario.noboa@teamsourcing.com.ec)
 2006-11-29 Paul A. Bagyenda <bagyenda@dsmagic.com>
 	* MM7/SOAP when Content XML tag missing 'cid:', don't fail
 2006-11-28 Paul A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 4711003..e4eb2d8 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -140,7 +140,7 @@ Octstr *mms_maketransid(char *qf, Octstr *mmscname)
      else
 	  x = octstr_create(qf);
           
-     res = octstr_format("%S@%S", mmscname, x);
+     res = octstr_format("%S-%S", mmscname, x);
      
      octstr_destroy(x);
      octstr_destroy(y);
@@ -154,7 +154,9 @@ extern Octstr *mms_getqf_fromtransid(Octstr *transid)
      
      if (transid == NULL)
 	return NULL;
-     i = octstr_search_char(transid, '@', 0);
+     i = octstr_search_char(transid, '-', 0);
+     if (i < 0)
+	  i = octstr_search_char(transid, '@', 0); /* XXX backward compartibility. */
      
      return (i >= 0) ? octstr_copy(transid, i+1, octstr_len(transid)) : octstr_duplicate(transid);
 }