diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index 750e63518..85a37b8f4 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -26,6 +26,7 @@
 #import <Foundation/NSString.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
+
 #import "NGVCard+SOGo.h"
 
 @implementation NGVCard (SOGoExtensions)
diff --git a/SoObjects/Contacts/NGVList+SOGo.m b/SoObjects/Contacts/NGVList+SOGo.m
index bce521a31..f0bc5fd46 100644
--- a/SoObjects/Contacts/NGVList+SOGo.m
+++ b/SoObjects/Contacts/NGVList+SOGo.m
@@ -25,11 +25,12 @@
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
-#import <SOGo/NSDictionary+Utilities.h>
-#import "NGVList+SOGo.h"
-
 #import <NGCards/NGVCardReference.h>
 
+#import <SOGo/NSDictionary+Utilities.h>
+
+#import "NGVList+SOGo.h"
+
 @implementation NGVList (SOGoExtensions)
 
 - (NSString *) ldifString
diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m
index 7514a14c5..98726070e 100644
--- a/UI/MailPartViewers/UIxMailPartSignedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m
@@ -170,11 +170,10 @@
 
   success = NO;
 
-  store = X509_STORE_new();
-
+  store = X509_STORE_new ();
   if (store)
     {
-      lookup = X509_STORE_add_lookup(store,X509_LOOKUP_file());
+      lookup = X509_STORE_add_lookup (store, X509_LOOKUP_file());
       if (lookup)
         {
           X509_LOOKUP_load_file (lookup, NULL, X509_FILETYPE_DEFAULT);