diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 50e2c4758..808275d36 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -21,20 +21,24 @@
  */
 
 #import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NGHashMap.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalPerson.h>
 #import <NGCards/iCalRepeatableEntityObject.h>
-#import <NGMime/NGMime.h>
-#import <NGMail/NGMail.h>
-#import <NGMail/NGSendMail.h>
+#import <NGMime/NGMimeBodyPart.h>
+#import <NGMime/NGMimeMultipartBody.h>
+#import <NGMail/NGMimeMessage.h>
 
 #import <SoObjects/SOGo/LDAPUserManager.h>
 #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
+#import <SoObjects/SOGo/SOGoMailer.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
@@ -332,7 +336,6 @@ static BOOL sendEMailNotifications = NO;
   NSString *pageName;
   iCalPerson *organizer;
   NSString *cn, *email, *sender, *iCalString;
-  NGSendMail *sendmail;
   WOApplication *app;
   unsigned i, count;
   iCalPerson *attendee;
@@ -360,9 +363,6 @@ static BOOL sendEMailNotifications = NO;
       /* generate iCalString once */
       iCalString = [[_newObject parent] versitString];
   
-      /* get sendmail object */
-      sendmail = [NGSendMail sharedSendMail];
-
       /* get WOApplication instance */
       app = [WOApplication application];
 
@@ -444,9 +444,10 @@ static BOOL sendEMailNotifications = NO;
           [body release];
 
           /* send the damn thing */
-          [sendmail sendMimePart: msg
-                    toRecipients: [NSArray arrayWithObject: email]
-                    sender: [organizer rfc822Email]];
+          [[SOGoMailer sharedMailer]
+	    sendMimePart: msg
+	    toRecipients: [NSArray arrayWithObject: email]
+	    sender: [organizer rfc822Email]];
         }
     }
 }
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index 5fc7b15aa..ac3b241cf 100644
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -19,19 +19,23 @@
   02111-1307, USA.
 */
 
-#import "SOGoTaskObject.h"
+#import <Foundation/NSException.h>
+#import <Foundation/NSUserDefaults.h>
 
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSNull+misc.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalToDo.h>
 #import <NGCards/iCalEventChanges.h>
 #import <NGCards/iCalPerson.h>
 #import <SOGo/LDAPUserManager.h>
-#import <NGMime/NGMime.h>
-#import <NGMail/NGMail.h>
-#import <NGMail/NGSendMail.h>
-#import "SOGoAptMailNotification.h"
+
+#import <SoObjects/SOGo/SOGoMailer.h>
 
 #import "NSArray+Appointments.h"
+#import "SOGoAptMailNotification.h"
+
+#import "SOGoTaskObject.h"
 
 @interface SOGoTaskObject (PrivateAPI)
 
diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m
index 40cc8d0bb..aefddbdd2 100644
--- a/UI/SOGoUI/SOGoACLAdvisory.m
+++ b/UI/SOGoUI/SOGoACLAdvisory.m
@@ -23,10 +23,10 @@
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NGHashMap.h>
 #import <NGMail/NGMimeMessage.h>
-#import <NGMail/NGSendMail.h>
 #import <NGMime/NGMimeBodyPart.h>
 #import <NGMime/NGMimeMultipartBody.h>
 
+#import <SoObjects/SOGo/SOGoMailer.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/LDAPUserManager.h>
@@ -195,9 +195,9 @@
   [message setBody: body];
   [body release];
 
-  [[NGSendMail sharedSendMail] sendMimePart: message
-			       toRecipients: [NSArray arrayWithObject: recipient]
-			       sender: [activeUser primaryEmail]];
+  [[SOGoMailer sharedMailer] sendMimePart: message
+			     toRecipients: [NSArray arrayWithObject: recipient]
+			     sender: [activeUser primaryEmail]];
 }
 
 @end