--- a/smsprotocols/smsstack/gsmu/src/gsmustor.cpp	Fri Mar 19 09:55:57 2010 +0200
+++ b/smsprotocols/smsstack/gsmu/src/gsmustor.cpp	Fri Apr 16 16:12:37 2010 +0300
@@ -142,7 +142,6 @@
 	DoOpenL();
  	// defect fix for EDNJJUN-4WYJGP
  	// Unable to send sms cause sms*.dat is corrupted
- 	// TODO - has to be back ported to higher versions
  	TRAPD(ret, InternalizeEntryArrayL());
 	if (ret != KErrNone)
 		{
@@ -184,8 +183,6 @@
 	DoCommitAndCompactL();
 #endif
 
-	//TODO AA: What should we do if err == KErrCorrupt?
-
 	CleanupStack::Pop(this);
 	iInTransaction = EFalse;
 
@@ -683,8 +680,11 @@
 #endif // _SMS_LOGGING_ENABLED
 
 	__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
-	TRAP_IGNORE(iFileStore->DeleteL(iEntryArray[aIndex].DataStreamId()));
-	iEntryArray[aIndex].SetIsDeleted(ETrue); // TODO - truth value should be set depending on ret
+	TRAPD(err, iFileStore->DeleteL(iEntryArray[aIndex].DataStreamId()));
+	if(err == KErrNone)
+	    {
+        iEntryArray[aIndex].SetIsDeleted(ETrue);
+  	    }
 	} // CSARStore::DoDeleteEntryL
 
 
@@ -790,7 +790,7 @@
 		}
 
 	stream << iExtraStreamId;
-	stream.CommitL(); // TODO - keep this in your head
+	stream.CommitL();
 	CleanupStack::PopAndDestroy(&stream);
 	} // CSARStore::ExternalizeEntryArrayL