diff --git a/SoObjects/Mailer/SOGoMailForward.h b/SoObjects/Mailer/SOGoMailForward.h
index 3732809ff..fd557a2b2 100644
--- a/SoObjects/Mailer/SOGoMailForward.h
+++ b/SoObjects/Mailer/SOGoMailForward.h
@@ -91,6 +91,9 @@
 @interface SOGoMailNorwegianNynorskForward : SOGoMailForward
 @end
 
+@interface SOGoMailPolishForward : SOGoMailForward
+@end
+
 @interface SOGoMailPortugueseForward : SOGoMailForward
 @end
 
@@ -103,9 +106,6 @@
 @interface SOGoMailSwedishForward : SOGoMailForward
 @end
 
-@interface SOGoMailPolishForward : SOGoMailForward
-@end
-
 @interface SOGoMailRussianForward : SOGoMailForward
 @end
 
diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index 0a7680d0e..35131a4d1 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -302,6 +302,9 @@
 @implementation SOGoMailNorwegianNynorskForward
 @end
 
+@implementation SOGoMailPolishForward
+@end
+
 @implementation SOGoMailPortugueseForward
 @end
 
@@ -314,9 +317,6 @@
 @implementation SOGoMailSwedishForward
 @end
 
-@implementation SOGoMailPolishForward
-@end
-
 @implementation SOGoMailRussianForward
 @end
 
diff --git a/SoObjects/Mailer/SOGoMailReply.h b/SoObjects/Mailer/SOGoMailReply.h
index 387ae902f..3d8c75aa1 100644
--- a/SoObjects/Mailer/SOGoMailReply.h
+++ b/SoObjects/Mailer/SOGoMailReply.h
@@ -90,6 +90,9 @@
 @interface SOGoMailNorwegianNynorskReply : SOGoMailReply
 @end
 
+@interface SOGoMailPolishReply : SOGoMailReply
+@end
+
 @interface SOGoMailPortugueseReply : SOGoMailReply
 @end
 
@@ -102,9 +105,6 @@
 @interface SOGoMailSwedishReply : SOGoMailReply
 @end
 
-@interface SOGoMailPolishReply : SOGoMailReply
-@end
-
 @interface SOGoMailRussianReply : SOGoMailReply
 @end
 
diff --git a/SoObjects/Mailer/SOGoMailReply.m b/SoObjects/Mailer/SOGoMailReply.m
index 8885bd4ab..b2d9afade 100644
--- a/SoObjects/Mailer/SOGoMailReply.m
+++ b/SoObjects/Mailer/SOGoMailReply.m
@@ -140,6 +140,9 @@
 @implementation SOGoMailNorwegianNynorskReply
 @end
 
+@implementation SOGoMailPolishReply
+@end
+
 @implementation SOGoMailPortugueseReply
 @end
 
@@ -152,9 +155,6 @@
 @implementation SOGoMailSwedishReply
 @end
 
-@implementation SOGoMailPolishReply
-@end
-
 @implementation SOGoMailRussianReply
 @end
 
diff --git a/Tests/Integration/preferences.py b/Tests/Integration/preferences.py
index ea3e7b10b..900ef8070 100644
--- a/Tests/Integration/preferences.py
+++ b/Tests/Integration/preferences.py
@@ -15,7 +15,7 @@ DEBUG=False
 # this should probably be fetched magically...
 SOGoSupportedLanguages = [ "Arabic", "Basque", "Catalan", "ChineseTaiwan", "Czech", "Dutch", "Danish", "Welsh", "English", "Finnish",
                            "SpanishSpain", "SpanishArgentina", "French", "German",
-                           "Icelandic", "Italian", "Hungarian", "BrazilianPortuguese",
+                           "Icelandic", "Italian", "Macedonian", "Hungarian", "Portuguese", "BrazilianPortuguese",
                            "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian", "Slovak",
                            "Slovenian", "Ukrainian", "Swedish" ];
 daysBetweenResponseList=[1,2,3,5,7,14,21,30]