diff --git a/mbuni/extras/pgsql-queue/mms_pgsql_queue.c b/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
index 6e9d84e..e8d0de0 100644
--- a/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
+++ b/mbuni/extras/pgsql-queue/mms_pgsql_queue.c
@@ -294,7 +294,7 @@ static MmsEnvelope *pgq_queue_readenvelope(char *qf, char *mms_queuedir, int sho
      if (mms_validate_address(e->from) != 0) {
 	  warning(0, "mms_queueread: Mal-formed address [%s] in queue entry %s/%s! "
 		  "Attempting fixup.", octstr_get_cstr(e->from), mms_queuedir, qf);
-	  _mms_fixup_address(&e->from, NULL);
+	  _mms_fixup_address(&e->from, NULL,1);
      }
      
      /* now read the headers... */
@@ -328,7 +328,7 @@ static MmsEnvelope *pgq_queue_readenvelope(char *qf, char *mms_queuedir, int sho
 	       if (mms_validate_address(t) != 0) {
 		    warning(0, "mms_queueread: Mal-formed address [%s] in queue entry %s/%s! " 
 			    "Attempting fixup.", res, mms_queuedir, qf);
-		    _mms_fixup_address(&t, NULL);
+		    _mms_fixup_address(&t, NULL,1);
 	       }
 	       to = gw_malloc(sizeof *to);
 	       to->rcpt = t;