diff --git a/src/engine/imap/message/imap-flag.vala b/src/engine/imap/message/imap-flag.vala
index b11ba078..29c34e2c 100644
--- a/src/engine/imap/message/imap-flag.vala
+++ b/src/engine/imap/message/imap-flag.vala
@@ -37,13 +37,61 @@ public abstract class Geary.Imap.Flag : Equalable, Hashable {
 }
 
 public class Geary.Imap.MessageFlag : Geary.Imap.Flag {
-    public static MessageFlag ANSWERED = new MessageFlag("\\answered");
-    public static MessageFlag DELETED = new MessageFlag("\\deleted");
-    public static MessageFlag DRAFT = new MessageFlag("\\draft");
-    public static MessageFlag FLAGGED = new MessageFlag("\\flagged");
-    public static MessageFlag RECENT = new MessageFlag("\\recent");
-    public static MessageFlag SEEN = new MessageFlag("\\seen");
-    public static MessageFlag ALLOWS_NEW = new MessageFlag("\\*");
+    private static MessageFlag? _answered = null;
+    public static MessageFlag ANSWERED { get {
+        if (_answered == null)
+            _answered = new MessageFlag("\\answered");
+        
+        return _answered;
+    } }
+    
+    private static MessageFlag? _deleted = null;
+    public static MessageFlag DELETED { get {
+        if (_deleted == null)
+            _deleted = new MessageFlag("\\deleted");
+        
+        return _deleted;
+    } }
+    
+    private static MessageFlag? _draft = null;
+    public static MessageFlag DRAFT { get {
+        if (_draft == null)
+            _draft = new MessageFlag("\\draft");
+        
+        return _draft;
+    } }
+    
+    private static MessageFlag? _flagged = null;
+    public static MessageFlag FLAGGED { get {
+        if (_flagged == null)
+            _flagged = new MessageFlag("\\flagged");
+        
+        return _flagged;
+    } }
+    
+    private static MessageFlag? _recent = null;
+    public static MessageFlag RECENT { get {
+        if (_recent == null)
+            _recent = new MessageFlag("\\recent");
+        
+        return _recent;
+    } }
+    
+    private static MessageFlag? _seen = null;
+    public static MessageFlag SEEN { get {
+        if (_seen == null)
+            _seen = new MessageFlag("\\seen");
+        
+        return _seen;
+    } }
+    
+    private static MessageFlag? _allows_new = null;
+    public static MessageFlag ALLOWS_NEW { get {
+        if (_allows_new == null)
+            _allows_new = new MessageFlag("\\*");
+        
+        return _allows_new;
+    } }
     
     public MessageFlag(string value) {
         base (value);
@@ -51,12 +99,53 @@ public class Geary.Imap.MessageFlag : Geary.Imap.Flag {
 }
 
 public class Geary.Imap.MailboxAttribute : Geary.Imap.Flag {
-    public static MailboxAttribute NO_INFERIORS = new MailboxAttribute("\\noinferiors");
-    public static MailboxAttribute NO_SELECT = new MailboxAttribute("\\noselect");
-    public static MailboxAttribute MARKED = new MailboxAttribute("\\marked");
-    public static MailboxAttribute UNMARKED = new MailboxAttribute("\\unmarked");
-    public static MailboxAttribute HAS_NO_CHILDREN = new MailboxAttribute("\\hasnochildren");
-    public static MailboxAttribute ALLOWS_NEW = new MailboxAttribute("\\*");
+    private static MailboxAttribute? _no_inferiors = null;
+    public static MailboxAttribute NO_INFERIORS { get {
+        if (_no_inferiors == null)
+            _no_inferiors = new MailboxAttribute("\\noinferiors");
+        
+        return _no_inferiors;
+    } }
+    
+    private static MailboxAttribute? _no_select = null;
+    public static MailboxAttribute NO_SELECT { get {
+        if (_no_select == null)
+            _no_select = new MailboxAttribute("\\noselect");
+        
+        return _no_select;
+    } }
+    
+    private static MailboxAttribute? _marked = null;
+    public static MailboxAttribute MARKED { get {
+        if (_marked == null)
+            _marked = new MailboxAttribute("\\marked");
+        
+        return _marked;
+    } }
+    
+    private static MailboxAttribute? _unmarked = null;
+    public static MailboxAttribute UNMARKED { get {
+        if (_unmarked == null)
+            _unmarked = new MailboxAttribute("\\unmarked");
+        
+        return _unmarked;
+    } }
+    
+    private static MailboxAttribute? _has_no_children = null;
+    public static MailboxAttribute HAS_NO_CHILDREN { get {
+        if (_has_no_children == null)
+            _has_no_children = new MailboxAttribute("\\hasnochildren");
+        
+        return _has_no_children;
+    } }
+    
+    private static MailboxAttribute? _allows_new = null;
+    public static MailboxAttribute ALLOWS_NEW { get {
+        if (_allows_new == null)
+            _allows_new = new MailboxAttribute("\\*");
+        
+        return _allows_new;
+    } }
     
     public MailboxAttribute(string value) {
         base (value);