1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/messaging/datamodel/action/MessageRecyclerAction.java b/src/com/android/messaging/datamodel/action/MessageRecyclerAction.java
index 86da6aa..5e1424d 100644
--- a/src/com/android/messaging/datamodel/action/MessageRecyclerAction.java
+++ b/src/com/android/messaging/datamodel/action/MessageRecyclerAction.java
@@ -41,13 +41,13 @@ public class MessageRecyclerAction extends Action implements Parcelable {
     public static void deleteMessagesOverLimit(final String conversationId, int protocol) {
 
         if (!PrefsUtils.isAutoDeleteEnabled() || (protocol != MessageData.PROTOCOL_SMS
-                && protocol != MessageData.PROTOCOL_MMS)) {
+                && protocol != MessageData.PROTOCOL_MMS) || conversationId == null) {
             return;
         }
 
         int cutOffLimit = PrefsUtils.getMessagesPerThreadLimitByProtocol(protocol);
         long cutOffTimeStampFromLimit = BugleDatabaseOperations.
-                getCutOffTimeStampFromLimit(conversationId, cutOffLimit, MessageData.PROTOCOL_SMS);
+                getCutOffTimeStampFromLimit(conversationId, cutOffLimit, protocol);
 
         if (cutOffTimeStampFromLimit > Long.MIN_VALUE) {
             deleteMessages(conversationId, protocol, cutOffTimeStampFromLimit);