diff --git a/src/engine/imap/transport/imap-deserializer.vala b/src/engine/imap/transport/imap-deserializer.vala
index 90c83549..2f0b6dbf 100644
--- a/src/engine/imap/transport/imap-deserializer.vala
+++ b/src/engine/imap/transport/imap-deserializer.vala
@@ -575,6 +575,12 @@ public class Geary.Imap.Deserializer : BaseObject, Logging.Source {
 
             case ']':
                 if (ch != get_current_context_terminator()) {
+                    if (state == State.ATOM) {
+                        // Allow ']' in atom IFF it does not close the context
+                        // this is to allow [] in folder names
+                        append_to_string(ch);
+                        return State.ATOM;
+                    }
                     warning("Received an unexpected closing brace");
                     return State.FAILED;
                 }