diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c
index 8f2a8fa..d7facf1 100644
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@@ -1519,19 +1519,8 @@ MmsMsg *mms_retrieveconf(MmsMsg *msg, Octstr *transactionid,
 {
      MmsMsg *m;
 
-
-     if (msg) {
-	  if (msg->message_type == MMS_MSGTYPE_RETRIEVE_CONF)
-	       return msg; /* Unchanged. XXX should we copy it instead?!! */
-#if 0
-	  /* we don't need this for mmbox ?? */
-	  if (msg->message_type != MMS_MSGTYPE_SEND_REQ)
-	       return NULL;
-#endif 
-     }
-
      m  = gw_malloc(sizeof *m);
-     m->msgId = msg ? octstr_duplicate(msg->msgId) : NULL;
+     m->msgId = msg ? octstr_duplicate(msg->msgId) : octstr_imm("00000");
 
      m->headers = http_create_empty_headers();
      m->message_type = MMS_MSGTYPE_RETRIEVE_CONF;