diff --git a/SoObjects/Mailer/SOGoMailBodyPart.h b/SoObjects/Mailer/SOGoMailBodyPart.h
index 7a996ebd6..bfb30aa2f 100644
--- a/SoObjects/Mailer/SOGoMailBodyPart.h
+++ b/SoObjects/Mailer/SOGoMailBodyPart.h
@@ -22,7 +22,7 @@
 #ifndef __Mailer_SOGoMailBodyPart_H__
 #define __Mailer_SOGoMailBodyPart_H__
 
-#include <Mailer/SOGoMailBaseObject.h>
+#import <Mailer/SOGoMailBaseObject.h>
 
 /*
   SOGoMailBodyPart
@@ -45,21 +45,23 @@
 
 /* hierarchy */
 
-- (SOGoMailObject *)mailObject;
+- (SOGoMailObject *) mailObject;
 
 /* IMAP4 */
 
-- (NSString *)bodyPartName;
-- (NSArray *)bodyPartPath;
-- (NSString *)bodyPartIdentifier;
+- (NSString *) bodyPartName;
+- (NSArray *) bodyPartPath;
+- (NSString *) bodyPartIdentifier;
 
 /* part info */
 
-- (id)partInfo;
+- (id) partInfo;
+- (NSData *) fetchBLOB;
 
 /* factory */
 
-+ (Class)bodyPartClassForKey:(NSString *)_key inContext:(id)_ctx;
++ (Class) bodyPartClassForKey: (NSString *) _key
+		    inContext: (id) _ctx;
 
 @end
 
diff --git a/SoObjects/Mailer/SOGoSharedMailAccount.m b/SoObjects/Mailer/SOGoSharedMailAccount.m
index 5b7ba9ec2..86922604b 100644
--- a/SoObjects/Mailer/SOGoSharedMailAccount.m
+++ b/SoObjects/Mailer/SOGoSharedMailAccount.m
@@ -19,8 +19,13 @@
   02111-1307, USA.
 */
 
-#include "SOGoSharedMailAccount.h"
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGImap4/NGImap4Connection.h>
+
+#import "SOGoSharedMailAccount.h"
 
 @interface SOGoMailAccount(UsedPrivates)