diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java
index 29af7569f..eca582921 100644
--- a/src/com/android/email/Controller.java
+++ b/src/com/android/email/Controller.java
@@ -1191,6 +1191,9 @@ public class Controller {
                 case EmailServiceStatus.CONNECTION_ERROR:
                     return new MessagingException(MessagingException.IOERROR);
 
+                case EmailServiceStatus.SECURITY_FAILURE:
+                    return new MessagingException(MessagingException.SECURITY_POLICIES_REQUIRED);
+
                 case EmailServiceStatus.MESSAGE_NOT_FOUND:
                 case EmailServiceStatus.ATTACHMENT_NOT_FOUND:
                 case EmailServiceStatus.FOLDER_NOT_DELETED:
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index 7a4a1742b..168f68a1e 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -1484,6 +1484,11 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
                         case MessagingException.GENERAL_SECURITY:
                             id = R.string.account_setup_failed_security;
                             break;
+                        // TODO Generate a unique string for this case, which is the case
+                        // where the security policy needs to be updated.
+                        case MessagingException.SECURITY_POLICIES_REQUIRED:
+                            id = R.string.account_setup_failed_security;
+                            break;
                     }
                 }
                 mHandler.showErrorBanner(getString(id));