diff --git a/mbuni/mmsbox/mmsbox_cfg.c b/mbuni/mmsbox/mmsbox_cfg.c
index 69a0378..e6055a4 100644
--- a/mbuni/mmsbox/mmsbox_cfg.c
+++ b/mbuni/mmsbox/mmsbox_cfg.c
@@ -502,6 +502,10 @@ Octstr  *get_mmsbox_queue_dir(Octstr *from, List *to, MmscGrp *m,
 	       _mms_fixup_address(&fto, octstr_get_cstr(unified_prefix), 1);
 	       if (fto)
 		    gwlist_insert(to, 0, fto); /* put it back, after modification. */	       
+	       if (xfrom) {
+		    octstr_delete(from, 0, octstr_len(from));
+		    octstr_append(from, xfrom);
+	       }
 	       octstr_destroy(xfrom);
 	  } else 
 	       _mcid = NULL;