diff --git a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
index 32ad6aa29b..1e46e07337 100644
--- a/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
+++ b/app/src/main/java/com/sun/mail/imap/IMAPFolder.java
@@ -1625,7 +1625,7 @@ public class IMAPFolder extends Folder implements UIDFolder, ResponseHandler {
     @Override
     public synchronized Flags getPermanentFlags() {
 	if (permanentFlags == null)
-	    return null;
+	    return new Flags();
 	return (Flags)(permanentFlags.clone());
     }