diff --git a/mbuni/mmsc/mmsmobilesender.c b/mbuni/mmsc/mmsmobilesender.c
index 02afcd8..c38f3fb 100644
--- a/mbuni/mmsc/mmsmobilesender.c
+++ b/mbuni/mmsc/mmsmobilesender.c
@@ -24,9 +24,9 @@ static MmsEnvelope *update_env(MmsEnvelope *e, MmsEnvelopeTo *xto, int success)
      time_t tnow = time(NULL);
      
      if (success && xto &&
-	 !(e->msgtype == MMS_MSGTYPE_SEND_REQ || 
-	   e->msgtype == MMS_MSGTYPE_RETRIEVE_CONF))
-	  xto->process = 0; /* No more processing. */
+	 e->msgtype != MMS_MSGTYPE_SEND_REQ && 
+	 e->msgtype != MMS_MSGTYPE_RETRIEVE_CONF)
+	  xto->process = 0; /* No more processing, unless it is a SEND/RETRIEVE */
      
      e->lasttry = tnow;
      e->attempts++;     	  
@@ -38,21 +38,6 @@ static MmsEnvelope *update_env(MmsEnvelope *e, MmsEnvelopeTo *xto, int success)
      return e;
 } 
 
-#if 0
-static MmsEnvelope *update_env_failed(MmsEnvelope *e)
-{
-     
-     time_t tnow = time(NULL);
-     
-     e->sendt = tnow + settings->send_back_off;
-     e->lasttry = tnow;
-     
-     if (settings->qfs->mms_queue_update(e) == 1)
-	  e = NULL;
-     return e;
-}
-#endif
-
 static void do_mm1_push(Octstr *rcpt_to, int isphonenum, MmsEnvelope *e, MmsMsg *msg)
 {
      List *pheaders;