diff --git a/UI/MailerUI/UIxEnvelopeAddressFormatter.m b/UI/MailerUI/UIxEnvelopeAddressFormatter.m
index b12ae8170..a5a2a20b7 100644
--- a/UI/MailerUI/UIxEnvelopeAddressFormatter.m
+++ b/UI/MailerUI/UIxEnvelopeAddressFormatter.m
@@ -19,9 +19,14 @@
   02111-1307, USA.
 */
 
-#include "UIxMailFormatter.h"
-#include <NGImap4/NGImap4EnvelopeAddress.h>
-#include "common.h"
+#import <Foundation/NSArray.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSObject+Values.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
+
+#import "UIxMailFormatter.h"
 
 @implementation UIxEnvelopeAddressFormatter
 
diff --git a/UI/MailerUI/UIxFilterList.m b/UI/MailerUI/UIxFilterList.m
index 2b9dfce9b..453d9ac41 100644
--- a/UI/MailerUI/UIxFilterList.m
+++ b/UI/MailerUI/UIxFilterList.m
@@ -19,7 +19,11 @@
   02111-1307, USA.
 */
 
-#include <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+#import <NGObjWeb/SoObject.h>
+#import <SoObjects/Mailer/SOGoMailFolder.h>
+#import <SoObjects/Mailer/SOGoMailObject.h>
+#import <SOGoUI/UIxComponent.h>
 
 /*
   UIxFilterList
@@ -36,10 +40,6 @@
 
 @end
 
-#include "common.h"
-#include <SoObjects/Mailer/SOGoMailFolder.h>
-#include <SoObjects/Mailer/SOGoMailObject.h>
-
 @implementation UIxFilterList
 
 - (void)dealloc {
diff --git a/UI/MailerUI/UIxMailEditorAction.m b/UI/MailerUI/UIxMailEditorAction.m
index 563bdabe7..e61b788ec 100644
--- a/UI/MailerUI/UIxMailEditorAction.m
+++ b/UI/MailerUI/UIxMailEditorAction.m
@@ -19,15 +19,22 @@
   02111-1307, USA.
 */
 
-#import "UIxMailEditorAction.h"
+#import <Foundation/NSDictionary.h>
 
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSException+misc.h>
+
+#import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/Mailer/SOGoDraftsFolder.h>
 #import <SoObjects/Mailer/SOGoDraftObject.h>
 #import <SoObjects/Mailer/SOGoMailAccount.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
-#import "common.h"
 
-#import <SOGo/NSString+Utilities.h>
+#import "UIxMailEditorAction.h"
 
 @implementation UIxMailEditorAction
 
diff --git a/UI/MailerUI/UIxMailMoveToPopUp.m b/UI/MailerUI/UIxMailMoveToPopUp.m
index 19179c548..3a19ee86e 100644
--- a/UI/MailerUI/UIxMailMoveToPopUp.m
+++ b/UI/MailerUI/UIxMailMoveToPopUp.m
@@ -19,7 +19,7 @@
  02111-1307, USA.
  */
 
-#include <NGObjWeb/WOComponent.h>
+#import <NGObjWeb/WOComponent.h>
 
 @class NSString, NSMutableArray, NSDictionary;
 
@@ -40,8 +40,6 @@
 
 @end
 
-#include "common.h"
-
 @implementation UIxMailMoveToPopUp
 
 - (void)dealloc {
diff --git a/UI/MailerUI/UIxMailReplyAction.m b/UI/MailerUI/UIxMailReplyAction.m
index 5d278097d..ac3e13b8e 100644
--- a/UI/MailerUI/UIxMailReplyAction.m
+++ b/UI/MailerUI/UIxMailReplyAction.m
@@ -19,16 +19,19 @@
   02111-1307, USA.
 */
 
-#import "UIxMailEditorAction.h"
-
-@interface UIxMailReplyAction : UIxMailEditorAction
-@end
-
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSString+misc.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
 #import <SoObjects/Mailer/SOGoDraftObject.h>
 #import <NGImap4/NGImap4EnvelopeAddress.h>
 #import <NGImap4/NGImap4Envelope.h>
-#import "common.h"
+
+#import "UIxMailEditorAction.h"
+
+@interface UIxMailReplyAction : UIxMailEditorAction
+@end
 
 @implementation UIxMailReplyAction
 
diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m
index d8c17cbbb..1345c80dd 100644
--- a/UI/MailerUI/UIxMailToSelection.m
+++ b/UI/MailerUI/UIxMailToSelection.m
@@ -19,7 +19,12 @@
  02111-1307, USA.
 */
 
-#include <SOGoUI/UIxComponent.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGMail/NGMailAddress.h>
+#import <NGMail/NGMailAddressParser.h>
+
+#import <SOGoUI/UIxComponent.h>
 
 /*
   UIxMailToSelection
@@ -66,9 +71,6 @@
 
 @end
 
-#include "common.h"
-#include <NGMail/NGMail.h>
-
 @implementation UIxMailToSelection
 
 static NSArray *headers = nil;