diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index f226145c7..997407c36 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -72,6 +72,7 @@
 #import "SOGoMailAccount.h"
 #import "SOGoMailAccounts.h"
 #import "SOGoTrashFolder.h"
+#import "SOGoJunkFolder.h"
 #import "SOGoMailObject+Draft.h"
 
 
@@ -1139,6 +1140,10 @@ static NSInteger _compareFetchResultsByUID (id entry1, id entry2, NSArray *uids)
                      isEqualToString:
                        [mailAccount trashFolderNameInContext: _ctx]])
             className = @"SOGoTrashFolder";
+          else if ([fullFolderName
+                     isEqualToString:
+                       [mailAccount junkFolderNameInContext: _ctx]])
+            className = @"SOGoJunkFolder";
           /*       else if ([folderName isEqualToString:
                    [mailAccount sieveFolderNameInContext: _ctx]])
                    obj = [self lookupFiltersFolder: _key inContext: _ctx]; */