Index: gw/bb_boxc.c
===================================================================
RCS file: /home/cvs/gateway/gw/bb_boxc.c,v
retrieving revision 1.85
diff -u -5 -r1.85 bb_boxc.c
--- gw/bb_boxc.c	23 Mar 2006 18:36:29 -0000	1.85
+++ gw/bb_boxc.c	2 Nov 2006 09:58:25 -0000
@@ -1520,10 +1520,16 @@
             /* debug("", 0, "gwlist_consume done 1"); */
             newmsg = NULL;
         }
         else {
             newmsg = msg = gwlist_consume(incoming_sms);
+            
+            /* Back at the first message? */
+            if (newmsg == startmsg) {
+                gwlist_insert(incoming_sms, 0, msg);
+                continue;
+            }
         }
 
         if (msg == NULL)
             break;