--- framework/subsystems/ogsmd/modems_orig/ti_calypso/mediator.py	Fri Sep 19 23:38:45 2008
+++ framework/subsystems/ogsmd/modems/ti_calypso/mediator.py	Sat Sep 13 14:52:11 2008
@@ -27,6 +27,16 @@
         exec execstring
 del mediator
 
+AbstractSimRetrieveMessagebook = SimRetrieveMessagebook
+#=========================================================================#
+class SimRetrieveMessagebook( AbstractSimRetrieveMessagebook ):
+#=========================================================================#
+    def responseFromChannel( self, request, response ):
+        if len(response) == 1 and response[0] == "+CMS ERROR: 321":
+            # index error, calypso returns this when there are no messages
+            return self._ok( [] )
+        return AbstractSimRetrieveMessagebook.responseFromChannel(self, request, response)
+
 #=========================================================================#
 class CallInitiate( CallMediator ):
 #=========================================================================#