Merge branch 'release/forth' into release/danube

ProtonMail · Oct 22, 2020 · 2d8a676 · 2d8a676
2 parents d547f5e + ae1578a
commit 2d8a676
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,11 @@
 
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
+## Unreleased
+
+### Fixed
+* GODT-829 Remove `NoInferior` to display sub-folders in apple mail.
+
 ## [Bridge 1.4.4] Forth
 
 ### Fixed
@@ -15,7 +20,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 ### Changed
 * Reverted sending IMAP updates to be not blocking again.
 
-### Fixed
+### Fixed
 * GODT-783 Settings flags by FLAGS (not using +/-FLAGS) do not change spam state.
 
 

diff --git a/internal/imap/mailbox.go b/internal/imap/mailbox.go
@@ -80,7 +80,10 @@ func (im *imapMailbox) Info() (*imap.MailboxInfo, error) {
 }
 
 func (im *imapMailbox) getFlags() []string {
-	flags := []string{imap.NoInferiorsAttr} // Subfolders are not yet supported by API.
+	flags := []string{}
+	if !im.storeMailbox.IsFolder() || im.storeMailbox.IsSystem() {
+		flags = append(flags, imap.NoInferiorsAttr) // Subfolders are not supported for System or Label
+	}
 	switch im.storeMailbox.LabelID() {
 	case pmapi.SentLabel:
 		flags = append(flags, specialuse.Sent)