diff --git a/SoObjects/Mailer/SOGoMailNamespace.m b/SoObjects/Mailer/SOGoMailNamespace.m
index 4bec0420a..419c7446d 100644
--- a/SoObjects/Mailer/SOGoMailNamespace.m
+++ b/SoObjects/Mailer/SOGoMailNamespace.m
@@ -1,6 +1,6 @@
 /* SOGoMailNamespace.m - this file is part of SOGo
  *
- * Copyright (C) 2010-2013 Inverse inc.
+ * Copyright (C) 2010-2022 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,6 +49,9 @@
       else if ([fullFolderName 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]; */
diff --git a/SoObjects/Mailer/product.plist b/SoObjects/Mailer/product.plist
index 9419fd65a..f4e9a80bd 100644
--- a/SoObjects/Mailer/product.plist
+++ b/SoObjects/Mailer/product.plist
@@ -44,6 +44,9 @@
     SOGoTrashFolder = {
       superclass    = "SOGoMailFolder";
     };
+    SOGoJunkFolder = {
+      superclass    = "SOGoMailFolder";
+    };
     SOGoMailObject = {
       superclass    = "SOGoMailBaseObject";
     };