diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 49e94378d..b1e61ad83 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -3974,7 +3974,8 @@ outer:
                     String email = sender.getAddress();
                     prefs.setSenderAsTrusted(email);
                 }
-            } else if (columnName.equals(UIProvider.ConversationColumns.VIEWED)) {
+            } else if (columnName.equals(UIProvider.ConversationColumns.VIEWED) ||
+                    columnName.equals(UIProvider.ConversationOperations.Parameters.SUPPRESS_UNDO)) {
                 // Ignore for now
             } else {
                 throw new IllegalArgumentException("Can't update " + columnName + " in message");