Release preparation

Fix Serbian translation
Add Serbian translation and update translations
2016-09-28 10:58:05 -04:00 · 2016-09-28 10:37:14 -04:00 · 2016-09-28 10:02:25 -04:00 · 2016-09-28 09:34:22 -04:00 · 2016-09-28 09:25:09 -04:00 · 2016-09-28 08:56:00 -04:00
901 changed files with 55144 additions and 23255 deletions
@@ -15,18 +15,26 @@ trans.es_ES = UI/MailerUI/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/MailerUI/Basque.lproj/Localizable.strings
 trans.fi = UI/MailerUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/MailerUI/French.lproj/Localizable.strings
+trans.hr_HR = UI/MailerUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/MailerUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/MailerUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/MailerUI/Italian.lproj/Localizable.strings
+trans.lt = UI/MailerUI/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/MailerUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/MailerUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/MailerUI/Polish.lproj/Localizable.strings
+trans.pt = UI/MailerUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/MailerUI/Russian.lproj/Localizable.strings
 trans.sk = UI/MailerUI/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/MailerUI/Slovenian.lproj/Localizable.strings
+trans.sr = UI/MailerUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/MailerUI/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/MailerUI/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-preferencesui]
 source_file = UI/PreferencesUI/English.lproj/Localizable.strings
@@ -42,18 +50,26 @@ trans.es_ES = UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/PreferencesUI/Basque.lproj/Localizable.strings
 trans.fi = UI/PreferencesUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/PreferencesUI/French.lproj/Localizable.strings
+trans.hr_HR = UI/PreferencesUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/PreferencesUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/PreferencesUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/PreferencesUI/Italian.lproj/Localizable.strings
+trans.lt = UI/PreferencesUI/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/PreferencesUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/PreferencesUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/PreferencesUI/Polish.lproj/Localizable.strings
+trans.pt = UI/PreferencesUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/PreferencesUI/Russian.lproj/Localizable.strings
 trans.sk = UI/PreferencesUI/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/PreferencesUI/Slovenian.lproj/Localizable.strings
+trans.sr = UI/PreferencesUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/PreferencesUI/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-scheduler]
 source_file = UI/Scheduler/English.lproj/Localizable.strings
@@ -69,18 +85,26 @@ trans.es_ES = UI/Scheduler/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/Scheduler/Basque.lproj/Localizable.strings
 trans.fi = UI/Scheduler/Finnish.lproj/Localizable.strings
 trans.fr = UI/Scheduler/French.lproj/Localizable.strings
+trans.hr_HR = UI/Scheduler/Croatian.lproj/Localizable.strings
 trans.hu = UI/Scheduler/Hungarian.lproj/Localizable.strings
 trans.is = UI/Scheduler/Icelandic.lproj/Localizable.strings
 trans.it = UI/Scheduler/Italian.lproj/Localizable.strings
+trans.lt = UI/Scheduler/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/Scheduler/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/Scheduler/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/Scheduler/Polish.lproj/Localizable.strings
+trans.pt = UI/Scheduler/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/Scheduler/Russian.lproj/Localizable.strings
 trans.sk = UI/Scheduler/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/Scheduler/Slovenian.lproj/Localizable.strings
+trans.sr = UI/Scheduler/Serbian.lproj/Localizable.strings
 trans.sv = UI/Scheduler/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/Scheduler/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-contacts]
 source_file = UI/Contacts/English.lproj/Localizable.strings
@@ -96,18 +120,26 @@ trans.es_ES = UI/Contacts/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/Contacts/Basque.lproj/Localizable.strings
 trans.fi = UI/Contacts/Finnish.lproj/Localizable.strings
 trans.fr = UI/Contacts/French.lproj/Localizable.strings
+trans.hr_HR = UI/Contacts/Croatian.lproj/Localizable.strings
 trans.hu = UI/Contacts/Hungarian.lproj/Localizable.strings
 trans.is = UI/Contacts/Icelandic.lproj/Localizable.strings
 trans.it = UI/Contacts/Italian.lproj/Localizable.strings
+trans.lt = UI/Contacts/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/Contacts/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/Contacts/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/Contacts/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/Contacts/Polish.lproj/Localizable.strings
+trans.pt = UI/Contacts/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/Contacts/Russian.lproj/Localizable.strings
 trans.sk = UI/Contacts/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/Contacts/Slovenian.lproj/Localizable.strings
+trans.sr = UI/Contacts/Serbian.lproj/Localizable.strings
 trans.sv = UI/Contacts/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/Contacts/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/Contacts/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/Contacts/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-mainui]
 source_file = UI/MainUI/English.lproj/Localizable.strings
@@ -123,18 +155,26 @@ trans.es_ES = UI/MainUI/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/MainUI/Basque.lproj/Localizable.strings
 trans.fi = UI/MainUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/MainUI/French.lproj/Localizable.strings
+trans.hr_HR = UI/MainUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/MainUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/MainUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/MainUI/Italian.lproj/Localizable.strings
+trans.lt = UI/MainUI/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/MainUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/MainUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/MainUI/Polish.lproj/Localizable.strings
+trans.pt = UI/MainUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/MainUI/Russian.lproj/Localizable.strings
 trans.sk = UI/MainUI/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/MainUI/Slovenian.lproj/Localizable.strings
+trans.sr = UI/MainUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/MainUI/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/MainUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/MainUI/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/MainUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-common]
 source_file = UI/Common/English.lproj/Localizable.strings
@@ -150,18 +190,26 @@ trans.es_ES = UI/Common/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/Common/Basque.lproj/Localizable.strings
 trans.fi = UI/Common/Finnish.lproj/Localizable.strings
 trans.fr = UI/Common/French.lproj/Localizable.strings
+trans.hr_HR = UI/Common/Croatian.lproj/Localizable.strings
 trans.hu = UI/Common/Hungarian.lproj/Localizable.strings
 trans.is = UI/Common/Icelandic.lproj/Localizable.strings
 trans.it = UI/Common/Italian.lproj/Localizable.strings
+trans.lt = UI/Common/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/Common/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/Common/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/Common/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/Common/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/Common/Polish.lproj/Localizable.strings
+trans.pt = UI/Common/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/Common/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/Common/Russian.lproj/Localizable.strings
 trans.sk = UI/Common/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/Common/Slovenian.lproj/Localizable.strings
+trans.sr = UI/Common/Serbian.lproj/Localizable.strings
 trans.sv = UI/Common/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/Common/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/Common/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/Common/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-administrationui]
 source_file = UI/AdministrationUI/English.lproj/Localizable.strings
@@ -177,18 +225,26 @@ trans.es_ES = UI/AdministrationUI/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/AdministrationUI/Basque.lproj/Localizable.strings
 trans.fi = UI/AdministrationUI/Finnish.lproj/Localizable.strings
 trans.fr = UI/AdministrationUI/French.lproj/Localizable.strings
+trans.hr_HR = UI/AdministrationUI/Croatian.lproj/Localizable.strings
 trans.hu = UI/AdministrationUI/Hungarian.lproj/Localizable.strings
 trans.is = UI/AdministrationUI/Icelandic.lproj/Localizable.strings
 trans.it = UI/AdministrationUI/Italian.lproj/Localizable.strings
+trans.lt = UI/AdministrationUI/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/AdministrationUI/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/AdministrationUI/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/AdministrationUI/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/AdministrationUI/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/AdministrationUI/Polish.lproj/Localizable.strings
+trans.pt = UI/AdministrationUI/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/AdministrationUI/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/AdministrationUI/Russian.lproj/Localizable.strings
 trans.sk = UI/AdministrationUI/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/AdministrationUI/Slovenian.lproj/Localizable.strings
+trans.sr = UI/AdministrationUI/Serbian.lproj/Localizable.strings
 trans.sv = UI/AdministrationUI/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/AdministrationUI/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/AdministrationUI/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-appointments]
 source_file = SoObjects/Appointments/English.lproj/Localizable.strings
@@ -204,18 +260,26 @@ trans.es_ES = SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings
 trans.eu = SoObjects/Appointments/Basque.lproj/Localizable.strings
 trans.fi = SoObjects/Appointments/Finnish.lproj/Localizable.strings
 trans.fr = SoObjects/Appointments/French.lproj/Localizable.strings
+trans.hr_HR = SoObjects/Appointments/Croatian.lproj/Localizable.strings
 trans.hu = SoObjects/Appointments/Hungarian.lproj/Localizable.strings
 trans.is = SoObjects/Appointments/Icelandic.lproj/Localizable.strings
 trans.it = SoObjects/Appointments/Italian.lproj/Localizable.strings
+trans.lt = SoObjects/Appointments/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = SoObjects/Appointments/Macedonian.lproj/Localizable.strings
 trans.nb_NO = SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = SoObjects/Appointments/Dutch.lproj/Localizable.strings
 trans.nn_NO = SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = SoObjects/Appointments/Polish.lproj/Localizable.strings
+trans.pt = SoObjects/Appointments/Portuguese.lproj/Localizable.strings
 trans.pt_BR = SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = SoObjects/Appointments/Russian.lproj/Localizable.strings
 trans.sk = SoObjects/Appointments/Slovak.lproj/Localizable.strings
+trans.sl_SI = SoObjects/Appointments/Slovenian.lproj/Localizable.strings
+trans.sr = SoObjects/Appointments/Serbian.lproj/Localizable.strings
 trans.sv = SoObjects/Appointments/Swedish.lproj/Localizable.strings
+trans.tr_TR = SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
 trans.uk = SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-contacts]
 source_file = SoObjects/Contacts/English.lproj/Localizable.strings
@@ -231,18 +295,26 @@ trans.es_ES = SoObjects/Contacts/SpanishSpain.lproj/Localizable.strings
 trans.eu = SoObjects/Contacts/Basque.lproj/Localizable.strings
 trans.fi = SoObjects/Contacts/Finnish.lproj/Localizable.strings
 trans.fr = SoObjects/Contacts/French.lproj/Localizable.strings
+trans.hr_HR = SoObjects/Contacts/Croatian.lproj/Localizable.strings
 trans.hu = SoObjects/Contacts/Hungarian.lproj/Localizable.strings
 trans.is = SoObjects/Contacts/Icelandic.lproj/Localizable.strings
 trans.it = SoObjects/Contacts/Italian.lproj/Localizable.strings
+trans.lt = SoObjects/Contacts/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = SoObjects/Contacts/Macedonian.lproj/Localizable.strings
 trans.nb_NO = SoObjects/Contacts/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = SoObjects/Contacts/Dutch.lproj/Localizable.strings
 trans.nn_NO = SoObjects/Contacts/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = SoObjects/Contacts/Polish.lproj/Localizable.strings
+trans.pt = SoObjects/Contacts/Portuguese.lproj/Localizable.strings
 trans.pt_BR = SoObjects/Contacts/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = SoObjects/Contacts/Russian.lproj/Localizable.strings
 trans.sk = SoObjects/Contacts/Slovak.lproj/Localizable.strings
+trans.sl_SI = SoObjects/Contacts/Slovenian.lproj/Localizable.strings
+trans.sr = SoObjects/Contacts/Serbian.lproj/Localizable.strings
 trans.sv = SoObjects/Contacts/Swedish.lproj/Localizable.strings
+trans.tr_TR = SoObjects/Contacts/TurkishTurkey.lproj/Localizable.strings
 trans.uk = SoObjects/Contacts/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-mailer]
 source_file = SoObjects/Mailer/English.lproj/Localizable.strings
@@ -258,18 +330,26 @@ trans.es_ES = SoObjects/Mailer/SpanishSpain.lproj/Localizable.strings
 trans.eu = SoObjects/Mailer/Basque.lproj/Localizable.strings
 trans.fi = SoObjects/Mailer/Finnish.lproj/Localizable.strings
 trans.fr = SoObjects/Mailer/French.lproj/Localizable.strings
+trans.hr_HR = SoObjects/Mailer/Croatian.lproj/Localizable.strings
 trans.hu = SoObjects/Mailer/Hungarian.lproj/Localizable.strings
 trans.is = SoObjects/Mailer/Icelandic.lproj/Localizable.strings
 trans.it = SoObjects/Mailer/Italian.lproj/Localizable.strings
+trans.lt = SoObjects/Mailer/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = SoObjects/Mailer/Macedonian.lproj/Localizable.strings
 trans.nb_NO = SoObjects/Mailer/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = SoObjects/Mailer/Dutch.lproj/Localizable.strings
 trans.nn_NO = SoObjects/Mailer/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = SoObjects/Mailer/Polish.lproj/Localizable.strings
+trans.pt = SoObjects/Mailer/Portuguese.lproj/Localizable.strings
 trans.pt_BR = SoObjects/Mailer/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = SoObjects/Mailer/Russian.lproj/Localizable.strings
 trans.sk = SoObjects/Mailer/Slovak.lproj/Localizable.strings
+trans.sl_SI = SoObjects/Mailer/Slovenian.lproj/Localizable.strings
+trans.sr = SoObjects/Mailer/Serbian.lproj/Localizable.strings
 trans.sv = SoObjects/Mailer/Swedish.lproj/Localizable.strings
+trans.tr_TR = SoObjects/Mailer/TurkishTurkey.lproj/Localizable.strings
 trans.uk = SoObjects/Mailer/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-mailpartviewers]
 source_file = UI/MailPartViewers/English.lproj/Localizable.strings
@@ -285,15 +365,23 @@ trans.es_ES = UI/MailPartViewers/SpanishSpain.lproj/Localizable.strings
 trans.eu = UI/MailPartViewers/Basque.lproj/Localizable.strings
 trans.fi = UI/MailPartViewers/Finnish.lproj/Localizable.strings
 trans.fr = UI/MailPartViewers/French.lproj/Localizable.strings
+trans.hr_HR = UI/MailPartViewers/Croatian.lproj/Localizable.strings
 trans.hu = UI/MailPartViewers/Hungarian.lproj/Localizable.strings
 trans.is = UI/MailPartViewers/Icelandic.lproj/Localizable.strings
 trans.it = UI/MailPartViewers/Italian.lproj/Localizable.strings
+trans.lt = UI/MailPartViewers/Lithuanian.lproj/Localizable.strings
+trans.mk_MK = UI/MailPartViewers/Macedonian.lproj/Localizable.strings
 trans.nb_NO = UI/MailPartViewers/NorwegianBokmal.lproj/Localizable.strings
 trans.nl = UI/MailPartViewers/Dutch.lproj/Localizable.strings
 trans.nn_NO = UI/MailPartViewers/NorwegianNynorsk.lproj/Localizable.strings
 trans.pl = UI/MailPartViewers/Polish.lproj/Localizable.strings
+trans.pt = UI/MailPartViewers/Portuguese.lproj/Localizable.strings
 trans.pt_BR = UI/MailPartViewers/BrazilianPortuguese.lproj/Localizable.strings
 trans.ru = UI/MailPartViewers/Russian.lproj/Localizable.strings
 trans.sk = UI/MailPartViewers/Slovak.lproj/Localizable.strings
+trans.sl_SI = UI/MailPartViewers/Slovenian.lproj/Localizable.strings
+trans.sr = UI/MailPartViewers/Serbian.lproj/Localizable.strings
 trans.sv = UI/MailPartViewers/Swedish.lproj/Localizable.strings
+trans.tr_TR = UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
 trans.uk = UI/MailPartViewers/Ukrainian.lproj/Localizable.strings
+trans.zh_TW = UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings
@@ -1 +1,4 @@
-# compilation settings
+ifeq ($(HAS_LIBRARY_ssl),yes)
+ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
+BUNDLE_LIBS += -lcrypto
+endif
@@ -101,7 +101,7 @@ static NSArray *asElementArray = nil;
  int i, count;
  
  if (!asElementArray)
-    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", nil];
+    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", @"Exception", nil];

  data = [NSMutableDictionary dictionary];

@@ -46,13 +46,49 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "NSDate+ActiveSync.h"
 #include "NSString+ActiveSync.h"

+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
+
@implementation NGVCard (ActiveSync)

+//
+// This function is called for each elements which can be ghosted according to specs. 
+// https://msdn.microsoft.com/en-us/library/gg650908%28v=exchg.80%29.aspx
+//
+- (BOOL) _isGhosted: (NSString *) element
+           inContext: (WOContext *) context
+{
+  NSArray *supportedElements;
+
+  supportedElements = [context objectForKey: @"SupportedElements"];
+
+  // If the client does not include a Supported element in the initial Sync command request for
+  // a folder, then all of the elements that can be ghosted are considered not ghosted.
+  if (!supportedElements)
+    return NO;
+
+  // If the client includes an empty Supported element in the initial Sync command request for 
+  // a folder, then all elements that can be ghosted are considered ghosted.
+  if (![supportedElements count])
+    return YES;
+
+  // If the client includes a Supported element that contains child elements in the initial 
+  // Sync command request for a folder, then each child element of that Supported element is 
+  // considered not ghosted. All elements that can be ghosted that are not included as child 
+  // elements of the Supported element are considered ghosted. 
+  if (!([supportedElements indexOfObject: element] == NSNotFound))
+    return YES;
+
+  return NO;
+}
+
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
  NSArray *emails, *addresses, *categories, *elements;
  CardElement *n, *homeAdr, *workAdr;
-  NSMutableString *s;
+  NSMutableString *s, *a;
  NSString *url;
  id o;

@@ -63,7 +99,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  if ((o = [n flattenedValueAtIndex: 0 forKey: @""]))
    [s appendFormat: @"<LastName xmlns=\"Contacts:\">%@</LastName>", [o activeSyncRepresentationInContext: context]];
-  
+
  if ((o = [n flattenedValueAtIndex: 1 forKey: @""]))
    [s appendFormat: @"<FirstName xmlns=\"Contacts:\">%@</FirstName>", [o activeSyncRepresentationInContext: context]];
  
@@ -106,7 +142,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    [s appendFormat: @"<JobTitle xmlns=\"Contacts:\">%@</JobTitle>", [o activeSyncRepresentationInContext: context]];
  
  if ((o = [self preferredEMail])) 
-    [s appendFormat: @"<Email1Address xmlns=\"Contacts:\">%@</Email1Address>", o];
+    [s appendFormat: @"<Email1Address xmlns=\"Contacts:\">%@</Email1Address>", [o activeSyncRepresentationInContext: context]];
  
  
  // Secondary email addresses (2 and 3)
@@ -116,7 +152,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      o = [[emails objectAtIndex: i] flattenedValuesForKey: @""];
      
-      [s appendFormat: @"<Email%dAddress xmlns=\"Contacts:\">%@</Email%dAddress>", i+2, o, i+2];
+      [s appendFormat: @"<Email%dAddress xmlns=\"Contacts:\">%@</Email%dAddress>", i+2, [o activeSyncRepresentationInContext: context], i+2];

      if (i == 1)
        break;
@@ -146,16 +182,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  if ([addresses count])
    {
      homeAdr = [addresses objectAtIndex: 0];
+      a = [NSMutableString string];
      
      if ((o = [homeAdr flattenedValueAtIndex: 2  forKey: @""]))
-        [s appendFormat: @"<HomeStreet xmlns=\"Contacts:\">%@</HomeStreet>", [o activeSyncRepresentationInContext: context]];
+        [a appendString: [o activeSyncRepresentationInContext: context]];
+
+      if ((o = [homeAdr flattenedValueAtIndex: 1  forKey: @""]) && [o length])
+        [a appendFormat: @"\n%@", [o activeSyncRepresentationInContext: context]];
      
+      [s appendFormat: @"<HomeStreet xmlns=\"Contacts:\">%@</HomeStreet>", [a activeSyncRepresentationInContext: context]];
+
      if ((o = [homeAdr flattenedValueAtIndex: 3  forKey: @""]))
        [s appendFormat: @"<HomeCity xmlns=\"Contacts:\">%@</HomeCity>", [o activeSyncRepresentationInContext: context]];
      
      if ((o = [homeAdr flattenedValueAtIndex: 4  forKey: @""]))
        [s appendFormat: @"<HomeState xmlns=\"Contacts:\">%@</HomeState>", [o activeSyncRepresentationInContext: context]];
-      
+
      if ((o = [homeAdr flattenedValueAtIndex: 5  forKey: @""]))
        [s appendFormat: @"<HomePostalCode xmlns=\"Contacts:\">%@</HomePostalCode>", [o activeSyncRepresentationInContext: context]];
      
@@ -171,9 +213,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  if ([addresses count])
    {
      workAdr = [addresses objectAtIndex: 0];
+      a = [NSMutableString string];
      
      if ((o = [workAdr flattenedValueAtIndex: 2  forKey: @""]))
-        [s appendFormat: @"<BusinessStreet xmlns=\"Contacts:\">%@</BusinessStreet>", [o activeSyncRepresentationInContext: context]];
+        [a appendString: [o activeSyncRepresentationInContext: context]];
+
+      if ((o = [workAdr flattenedValueAtIndex: 1  forKey: @""]) && [o length])
+        [a appendFormat: @"\n%@", [o activeSyncRepresentationInContext: context]];
+
+      [s appendFormat: @"<BusinessStreet xmlns=\"Contacts:\">%@</BusinessStreet>", [a activeSyncRepresentationInContext: context]];
      
      if ((o = [workAdr flattenedValueAtIndex: 3  forKey: @""]))
        [s appendFormat: @"<BusinessCity xmlns=\"Contacts:\">%@</BusinessCity>", [o activeSyncRepresentationInContext: context]];
@@ -190,7 +238,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  // Other, less important fields
  if ((o = [self birthday]))
-    [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>", [o activeSyncRepresentationInContext: context]];
+    {
+      [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>",
+         [[o dateByAddingYears: 0 months: 0 days: 0
+                         hours: -12 minutes: 0
+                       seconds: 0]
+              activeSyncRepresentationInContext: context]];
+    }

  if ((o = [self note]))
    {
@@ -217,6 +271,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                    inContext: (WOContext *) context
 {
  CardElement *element;
+  NSMutableArray *addressLines;
  id o;
  
  // Contact's note
@@ -226,6 +281,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // Categories
  if ((o = [theValues objectForKey: @"Categories"]) && [o length])
    [self setCategories: o];
+  else
+    [[self children] removeObjectsInArray: [self childrenWithTag: @"Categories"]];

  // Birthday
  if ((o = [theValues objectForKey: @"Birthday"]))
@@ -233,6 +290,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      o = [o calendarDate];
      [self setBday: [o descriptionWithCalendarFormat: @"%Y-%m-%d" timeZone: nil locale: nil]];
    }
+  else if (![self _isGhosted: @"Birthday" inContext: context])
+    {
+      [self setBday: @""];
+    }
+

  //
  // Business address information
@@ -244,18 +306,48 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // BusinessCountry
  //
  element = [self elementWithTag: @"adr" ofType: @"work"];
-  [element setSingleValue: @""
-                  atIndex: 1 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"BusinessStreet"]
-                  atIndex: 2 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"BusinessCity"]
-                  atIndex: 3 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"BusinessState"]
-                  atIndex: 4 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"BusinessPostalCode"]
-                  atIndex: 5 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"BusinessCountry"]
-                  atIndex: 6 forKey: @""];
+
+  if ((o = [theValues objectForKey: @"BusinessStreet"]) || ![self _isGhosted: @"BusinessStreet" inContext: context])
+    {
+      addressLines = [NSMutableArray arrayWithArray: [o componentsSeparatedByString: @"\n"]];
+
+      [element setSingleValue: @""
+                      atIndex: 1 forKey: @""];
+      [element setSingleValue: [addressLines count] ? [addressLines objectAtIndex: 0] : @""
+                      atIndex: 2 forKey: @""];
+
+      // Extended address line. If there are more than 2 address lines we add them to the extended address line.
+      if ([addressLines count] > 1)
+        {
+          [addressLines removeObjectAtIndex: 0];
+          [element setSingleValue: [addressLines componentsJoinedByString: @" "]
+                          atIndex: 1 forKey: @""];
+        }
+     }
+
+  if ((o = [theValues objectForKey: @"BusinessCity"]) || ![self _isGhosted: @"BusinessCity" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"BusinessCity"]
+                      atIndex: 3 forKey: @""];
+    }
+
+  if ((o = [theValues objectForKey: @"BusinessState"]) || ![self _isGhosted: @"BusinessState" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"BusinessState"]
+                      atIndex: 4 forKey: @""];
+    }
+
+  if ((o = [theValues objectForKey: @"BusinessPostalCode"]) || ![self _isGhosted: @"BusinessPostalCode" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"BusinessPostalCode"]
+                      atIndex: 5 forKey: @""];
+    }
+
+  if ((o = [theValues objectForKey: @"BusinessCountry"]) || ![self _isGhosted: @"BusinessCountry" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"BusinessCountry"]
+                      atIndex: 6 forKey: @""];
+    }

  //
  // Home address information
@@ -267,35 +359,69 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // HomeCountry
  //
  element = [self elementWithTag: @"adr" ofType: @"home"];
-  [element setSingleValue: @""
-                  atIndex: 1 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"HomeStreet"]
-                  atIndex: 2 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"HomeCity"]
-                  atIndex: 3 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"HomeState"]
-                  atIndex: 4 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"HomePostalCode"]
-                  atIndex: 5 forKey: @""];
-  [element setSingleValue: [theValues objectForKey: @"HomeCountry"]
-                  atIndex: 6 forKey: @""];
+
+  if ((o = [theValues objectForKey: @"HomeStreet"]) || ![self _isGhosted: @"HomeStreet" inContext: context])
+    {
+      addressLines = [NSMutableArray arrayWithArray: [o componentsSeparatedByString: @"\n"]];
+
+      [element setSingleValue: @""
+                      atIndex: 1 forKey: @""];
+      [element setSingleValue: [addressLines count] ? [addressLines objectAtIndex: 0] : @""
+                      atIndex: 2 forKey: @""];
+
+      // Extended address line. If there are more then 2 address lines we add them to the extended address line.
+      if ([addressLines count] > 1)
+        {
+          [addressLines removeObjectAtIndex: 0];
+          [element setSingleValue: [addressLines componentsJoinedByString: @" "]
+                          atIndex: 1 forKey: @""];
+        }
+    }
+
+  if ((o = [theValues objectForKey: @"HomeCity"]) || ![self _isGhosted: @"HomeCity" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"HomeCity"]
+                      atIndex: 3 forKey: @""];
+    }
+
+  if ((o = [theValues objectForKey: @"HomeState"]) || ![self _isGhosted: @"HomeState" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"HomeState"]
+                      atIndex: 4 forKey: @""];
+    }
+
+  if ((o = [theValues objectForKey: @"HomePostalCode"]) || ![self _isGhosted: @"HomePostalCode" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"HomePostalCode"]
+                      atIndex: 5 forKey: @""];
+    }
+
+  if ((o = [theValues objectForKey: @"HomeCountry"]) || ![self _isGhosted: @"HomeCountry" inContext: context])
+    {
+      [element setSingleValue: [theValues objectForKey: @"HomeCountry"]
+                      atIndex: 6 forKey: @""];
+    }

  // Company's name
  if ((o = [theValues objectForKey: @"CompanyName"]))
    [self setOrg: o  units: nil];
+  else if (![self _isGhosted: @"CompanyName" inContext: context])
+    [self setOrg: @""  units: nil];
  
  // Department
  if ((o = [theValues objectForKey: @"Department"]))
    [self setOrg: nil  units: [NSArray arrayWithObjects:o,nil]];
+  else if (![self _isGhosted: @"Department" inContext: context])
+    [self setOrg: nil  units: [NSArray arrayWithObjects:@"",nil]];
  
  // Email addresses
-  if ((o = [theValues objectForKey: @"Email1Address"]))
+  if ((o = [theValues objectForKey: @"Email1Address"]) || ![self _isGhosted: @"Email1Address" inContext: context])
    {
      element = [self elementWithTag: @"email" ofType: @"work"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
    }
  
-  if ((o = [theValues objectForKey: @"Email2Address"]))
+  if ((o = [theValues objectForKey: @"Email2Address"]) || ![self _isGhosted: @"Email2Address" inContext: context])
    {
      element = [self elementWithTag: @"email" ofType: @"home"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
@@ -303,7 +429,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  // SOGo currently only supports 2 email addresses ... but AS clients might send 3
  // FIXME: revise this when the GUI revamp is done in SOGo
-  if ((o = [theValues objectForKey: @"Email3Address"]))
+  if ((o = [theValues objectForKey: @"Email3Address"]) || ![self _isGhosted: @"Email3Address" inContext: context])
    {
      element = [self elementWithTag: @"email" ofType: @"three"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
@@ -313,45 +439,62 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // MiddleName
  // Suffix   (II)
  // Title    (Mr.)
-  [self setFn: [theValues objectForKey: @"FileAs"]];
+  if ((o = [theValues objectForKey: @"FileAs"]) || ![self _isGhosted: @"FileAs" inContext: context])
+    [self setFn: [theValues objectForKey: @"FileAs"]];

  [self setNWithFamily: [theValues objectForKey: @"LastName"]
                 given: [theValues objectForKey: @"FirstName"]
            additional: nil prefixes: nil suffixes: nil];
  
  // IM information
-  [[self uniqueChildWithTag: @"x-aim"]
-    setSingleValue: [theValues objectForKey: @"IMAddress"]
-            forKey: @""];
+  if ((o = [theValues objectForKey: @"IMAddress"]) || ![self _isGhosted: @"IMAddress" inContext: context])
+    [[self uniqueChildWithTag: @"x-aim"]
+      setSingleValue: [theValues objectForKey: @"IMAddress"]
+              forKey: @""];

  //
  // Phone numbrrs
  //
-  element = [self elementWithTag: @"tel" ofType: @"work"];
-  [element setSingleValue: [theValues objectForKey: @"BusinessPhoneNumber"]  forKey: @""];
+  if ((o = [theValues objectForKey: @"BusinessPhoneNumber"]) || ![self _isGhosted: @"BusinessPhoneNumber" inContext: context])
+    {
+      element = [self elementWithTag: @"tel" ofType: @"work"];
+      [element setSingleValue: [theValues objectForKey: @"BusinessPhoneNumber"]  forKey: @""];
+    }

-  element = [self elementWithTag: @"tel" ofType: @"home"];
-  [element setSingleValue: [theValues objectForKey: @"HomePhoneNumber"]  forKey: @""];
+  if ((o = [theValues objectForKey: @"HomePhoneNumber"]) || ![self _isGhosted: @"HomePhoneNumber" inContext: context])
+    {
+      element = [self elementWithTag: @"tel" ofType: @"home"];
+      [element setSingleValue: [theValues objectForKey: @"HomePhoneNumber"]  forKey: @""];
+    }

-  element = [self elementWithTag: @"tel" ofType: @"cell"];
-  [element setSingleValue: [theValues objectForKey: @"MobilePhoneNumber"]  forKey: @""];
+  if ((o = [theValues objectForKey: @"MobilePhoneNumber"]) || ![self _isGhosted: @"MobilePhoneNumber" inContext: context])
+    {
+      element = [self elementWithTag: @"tel" ofType: @"cell"];
+      [element setSingleValue: [theValues objectForKey: @"MobilePhoneNumber"]  forKey: @""];
+    }

-  element = [self elementWithTag: @"tel" ofType: @"fax"];
-  [element setSingleValue: [theValues objectForKey: @"BusinessFaxNumber"]  forKey: @""];
+  if ((o = [theValues objectForKey: @"BusinessFaxNumber"]) || ![self _isGhosted: @"BusinessFaxNumber" inContext: context])
+    {
+      element = [self elementWithTag: @"tel" ofType: @"fax"];
+      [element setSingleValue: [theValues objectForKey: @"BusinessFaxNumber"]  forKey: @""];
+    }

-  element = [self elementWithTag: @"tel" ofType: @"pager"];
-  [element setSingleValue: [theValues objectForKey: @"PagerNumber"]  forKey: @""];
+  if ((o = [theValues objectForKey: @"PagerNumber"]) || ![self _isGhosted: @"PagerNumber" inContext: context])
+    {
+      element = [self elementWithTag: @"tel" ofType: @"pager"];
+      [element setSingleValue: [theValues objectForKey: @"PagerNumber"]  forKey: @""];
+    }
  
  // Job's title
-  if ((o = [theValues objectForKey: @"JobTitle"]))
+  if ((o = [theValues objectForKey: @"JobTitle"]) || ![self _isGhosted: @"JobTitle" inContext: context])
    [self setTitle: o];
  
  // WebPage (work)
-  if ((o = [theValues objectForKey: @"WebPage"]))
+  if ((o = [theValues objectForKey: @"WebPage"]) || ![self _isGhosted: @"WebPage" inContext: context])
    [[self elementWithTag: @"url" ofType: @"work"]
          setSingleValue: o  forKey: @""];
  
-  if ((o = [theValues objectForKey: @"NickName"]))
+  if ((o = [theValues objectForKey: @"NickName"]) || ![self _isGhosted: @"NickName" inContext: context])
    [self setNickname: o];

  if ((o = [theValues objectForKey: @"Picture"]))
@@ -53,6 +53,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (NSString *) itemid;
 - (BOOL) acceptsMultiPart;
 - (NSData *) convertHexStringToBytes;
+- (NSString *) protocolVersion;

@end

@@ -46,97 +46,6 @@ static NSArray *easCommandParameters = nil;

@implementation NSString (ActiveSync)

-//
-// This is a copy from NSString+XMLEscaping.m from SOPE.
-// The difference here is that we use wchar_t instead of unichar.
-// This is needed to get the rigth numeric character reference.
-// e.g. SMILING FACE WITH OPEN MOUTH
-//      ok: wchar_t -> &#128515;   wrong:  unichar -> &#55357; &#56835;
-//
-// We avoir naming it like the one in SOPE since if the ActiveSync
-// bundle is loaded, it'll overwrite the one provided by SOPE.
-//
- (NSString *) _stringByEscapingXMLStringUsingCharacters {
-  register unsigned i, len, j;
-  register wchar_t *buf;
-  const wchar_t *chars;
-  unsigned escapeCount;
-
-  if ([self length] == 0) return @"";
-
-  NSData *data = [self dataUsingEncoding:NSUTF32StringEncoding];
-  chars = [data bytes];
-  len = [data length]/4;
-
-  /* check for characters to escape ... */
-  for (i = 0, escapeCount = 0; i < len; i++) {
-    switch (chars[i]) {
-      case '&': case '"': case '<': case '>': case '\r':
-        escapeCount++;
-        break;
-      default:
-        if (chars[i] > 127)
-          escapeCount++;
-        break;
-    }
-  }
-  if (escapeCount == 0 ) {
-    /* nothing to escape ... */
-    return [[self copy] autorelease];
-  }
-
-  buf = calloc((len + 5) + (escapeCount * 16), sizeof(wchar_t));
-  for (i = 0, j = 0; i < len; i++) {
-    switch (chars[i]) {
-      /* escape special chars */
-      case '\r':
-        buf[j] = '&'; j++; buf[j] = '#'; j++; buf[j] = '1'; j++;
-        buf[j] = '3'; j++; buf[j] = ';'; j++;
-        break;
-      case '&':
-        buf[j] = '&'; j++; buf[j] = 'a'; j++; buf[j] = 'm'; j++;
-        buf[j] = 'p'; j++; buf[j] = ';'; j++;
-        break;
-      case '"':
-        buf[j] = '&'; j++; buf[j] = 'q'; j++; buf[j] = 'u'; j++;
-        buf[j] = 'o'; j++; buf[j] = 't'; j++; buf[j] = ';'; j++;
-        break;
-      case '<':
-        buf[j] = '&'; j++; buf[j] = 'l'; j++; buf[j] = 't'; j++;
-        buf[j] = ';'; j++;
-        break;
-      case '>':
-        buf[j] = '&'; j++; buf[j] = 'g'; j++; buf[j] = 't'; j++;
-        buf[j] = ';'; j++;
-        break;
-
-      default:
-        /* escape big chars */
-        if (chars[i] > 127) {
-          unsigned char nbuf[32];
-          unsigned int k;
-
-          sprintf((char *)nbuf, "&#%i;", (int)chars[i]);
-          for (k = 0; nbuf[k] != '\0'; k++) {
-            buf[j] = nbuf[k];
-            j++;
-          }
-        }
-        else if (chars[i] == 0x9 || chars[i] == 0xA || chars[i] == 0xD || chars[i] >= 0x20) { // ignore any unsupported control character
-          /* nothing to escape */
-          buf[j] = chars[i];
-          j++;
-        }
-        break;
-    }
-  }
-  
-  self = [[[NSString alloc] initWithBytes:buf length:(j) * sizeof(wchar_t) encoding:NSUTF32StringEncoding] autorelease];
-
-  if (buf)   free(buf);
-  return self;
-}
-
 - (NSString *) sanitizedServerIdWithType: (SOGoMicrosoftActiveSyncFolderType) folderType
 {
  if (folderType == ActiveSyncEventFolder)
@@ -156,7 +65,7 @@ static NSArray *easCommandParameters = nil;

 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
-  return [self _stringByEscapingXMLStringUsingCharacters];
+  return [self safeStringByEscapingXMLString: YES];
 }

 - (int) activeSyncFolderType
@@ -229,6 +138,27 @@ static NSArray *easCommandParameters = nil;
  return o;
 }

+- (NSString *) protocolVersion
+{
+  NSMutableArray *components;
+
+  components = [NSMutableArray arrayWithArray: [[[self componentsSeparatedByString: @"?"] lastObject] componentsSeparatedByString: @"&"]];
+
+  // We handle BASE64 encoded queryStrings. See http://msdn.microsoft.com/en-us/library/ee160227%28v=exchg.80%29.aspx for details.
+  if ([components count] == 1)
+    {
+      NSData *queryString;
+      const char* qs_bytes;
+
+      queryString = [[components objectAtIndex: 0] dataByDecodingBase64];
+      qs_bytes = (const char*)[queryString bytes];
+
+      return [NSString stringWithFormat:@"%.1f", (float)((uint8_t)qs_bytes[0]/10)];
+    }
+
+  return nil;
+}
+
 - (NSString *) _valueForParameter: (NSString *) theParameter
 {
  NSMutableArray *components;
@@ -1,6 +1,6 @@
 /*

-Copyright (c) 2014, Inverse inc.
+Copyright (c) 2014-2015, Inverse inc.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -31,15 +31,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include "SOGoActiveSyncConstants.h"

+@class NSCalendarDate;
@class NSException;
+@class NSMutableDictionary;
@class NSURL;
+@class NSNumber;
+
+static volatile BOOL easShouldTerminate = NO;

@interface SOGoActiveSyncDispatcher : NSObject
 {
  NSURL *folderTableURL;
+  NSDictionary *imapFolderGUIDS;
  id context;
+
+  NSNumber *syncRequest;
+  BOOL debugOn;
 }

+- (NSMutableDictionary *) globalMetadataForDevice;
+
 - (id) collectionFromId: (NSString *) theCollectionId
                   type: (SOGoMicrosoftActiveSyncFolderType) theFolderType;

@@ -52,5 +63,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 - (NSURL *) folderTableURL;
 - (void) ensureFolderTableExists;
+- (BOOL) easShouldTerminate;

@end
@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSString.h>
+#import <Foundation/NSCharacterSet.h>

 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
@@ -77,6 +78,41 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #import <Appointments/SOGoAptMailNotification.h>

+unsigned char strToChar(char a, char b) {
+    char encoder[3] = {'\0','\0','\0'};
+    encoder[0] = a;
+    encoder[1] = b;
+    return (char) strtol(encoder,NULL,16);
+}
+
+@interface NSString (NSStringExtensions)
+- (NSData *) decodeFromHexidecimal;
+@end
+
+@implementation NSString (NSStringExtensions)
+
+- (NSData *) decodeFromHexidecimal;
+{
+    const char * bytes = [self cStringUsingEncoding: NSUTF8StringEncoding];
+    NSUInteger length = strlen(bytes);
+    unsigned char * r = (unsigned char *) malloc(length / 2 + 1);
+    unsigned char * index = r;
+
+    while ((*bytes) && (*(bytes +1))) {
+        *index = strToChar(*bytes, *(bytes +1));
+        index++;
+        bytes+=2;
+    }
+    *index = '\0';
+
+    NSData * result = [NSData dataWithBytes: r length: length / 2];
+    free(r);
+
+    return result;
+}
+
+@end
+
 typedef struct {
  uint32_t dwLowDateTime;
  uint32_t dwHighDateTime;
@@ -91,7 +127,7 @@ struct GlobalObjectId {
  FILETIME                  CreationTime;
  uint8_t                   X[8];
  uint32_t                  Size;
-  uint8_t*                  Data;
+  uint8_t Data[0];
 };

@implementation SOGoMailObject (ActiveSync)
@@ -118,39 +154,40 @@ struct GlobalObjectId {
 //
 // The GlobalObjId is documented here: http://msdn.microsoft.com/en-us/library/ee160198(v=EXCHG.80).aspx
 //
+
 - (NSData *) _computeGlobalObjectIdFromEvent: (iCalEvent *) event
 {
  NSData *binPrefix, *globalObjectId, *uidAsASCII;
  NSString *prefix, *uid;
-
-  struct GlobalObjectId newGlobalId;
+  struct GlobalObjectId *newGlobalId;
  const char *bytes;
-  
+
+  uid = [event uid];
+  uidAsASCII = [uid decodeFromHexidecimal];
+  newGlobalId = (struct GlobalObjectId*)calloc(sizeof(uint8_t), sizeof(struct GlobalObjectId) + 0x0c + [uidAsASCII length]);
+
  prefix = @"040000008200e00074c5b7101a82e008";

  // dataPrefix is "vCal-Uid %x01 %x00 %x00 %x00"
  uint8_t dataPrefix[] = { 0x76, 0x43, 0x61, 0x6c, 0x2d, 0x55, 0x69, 0x64, 0x01, 0x00, 0x00, 0x00 };
-  uid = [event uid];

  binPrefix = [prefix convertHexStringToBytes];
-  [binPrefix getBytes: &newGlobalId.ByteArrayID];
-  [self _setInstanceDate: &newGlobalId
+  [binPrefix getBytes: &newGlobalId->ByteArrayID];
+  [self _setInstanceDate: newGlobalId
                fromDate: [event recurrenceId]];
-  uidAsASCII = [uid dataUsingEncoding: NSASCIIStringEncoding];
  bytes = [uidAsASCII bytes];

  // 0x0c is the size of our dataPrefix
-  newGlobalId.Size = 0x0c + [uidAsASCII length];
-  newGlobalId.Data = malloc(newGlobalId.Size * sizeof(uint8_t));
-  memcpy(newGlobalId.Data, dataPrefix, 0x0c);
-  memcpy(newGlobalId.Data + 0x0c, bytes, newGlobalId.Size - 0x0c);
+  newGlobalId->Size = 0x0c + [uidAsASCII length];
+  memcpy(newGlobalId->Data, dataPrefix, 0x0c);
+  memcpy(newGlobalId->Data + 0x0c, bytes, newGlobalId->Size - 0x0c);

-  globalObjectId = [[NSData alloc] initWithBytes: &newGlobalId  length: 40 + newGlobalId.Size*sizeof(uint8_t)];
-  free(newGlobalId.Data);
-  
+  globalObjectId = [[NSData alloc] initWithBytes: newGlobalId  length: 40 + newGlobalId->Size*sizeof(uint8_t)];
+  free(newGlobalId);
  return [globalObjectId autorelease];
 }

+
 //
 // For debugging purposes...
 //
@@ -436,18 +473,131 @@ struct GlobalObjectId {
  return d;
 }

+//
+//
+//
+- (BOOL) _sanitinizeNeeded: (NSArray *) theParts
+{
+  NSString *encoding, *charset;
+  int i;
+
+  for (i = 0; i < [theParts count]; i++)
+    {
+      encoding = [[theParts objectAtIndex: i ] objectForKey: @"encoding"];
+      charset = [[[theParts objectAtIndex: i ] objectForKey: @"parameterList"] objectForKey: @"charset"];
+      if (encoding && ([encoding caseInsensitiveCompare: @"7bit"] == NSOrderedSame || [encoding caseInsensitiveCompare: @"8bit"] == NSOrderedSame) &&
+          charset  && ![charset caseInsensitiveCompare: @"utf-8"] == NSOrderedSame
+                   && ![charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame)
+        {
+          return YES;
+        }
+
+      if ([self _sanitinizeNeeded: [[theParts objectAtIndex: i ] objectForKey: @"parts"]])
+          return YES;
+   }
+
+   return NO;
+}
+
+
+- (BOOL) _isSigned: (NSDictionary *) thePart
+{
+  NSMutableDictionary *currentPart;
+  NSArray *subparts;
+  NSString *type, *subtype;
+  NSUInteger i;
+
+  type = [[thePart objectForKey: @"type"] lowercaseString];
+  subtype = [[thePart objectForKey: @"subtype"] lowercaseString];
+
+  if ([type isEqualToString: @"multipart"])
+    {
+      if ([subtype isEqualToString: @"signed"])
+        return YES;
+
+      subparts = [thePart objectForKey: @"parts"];
+      for (i = 0; i < [subparts count]; i++)
+        {
+          currentPart = [subparts objectAtIndex: i];
+          if ([self _isSigned: currentPart])
+            return YES;
+        }
+    }
+
+  return NO;
+}
+
+- (BOOL) _isSmimeEncrypted: (NSDictionary *) thePart
+{
+  NSMutableDictionary *currentPart;
+  NSArray *subparts;
+  NSString *type, *subtype;
+  NSUInteger i;
+
+  type = [[thePart objectForKey: @"type"] lowercaseString];
+  subtype = [[thePart objectForKey: @"subtype"] lowercaseString];
+
+  if ([type isEqualToString: @"multipart"])
+    {
+      subparts = [thePart objectForKey: @"parts"];
+      for (i = 0; i < [subparts count]; i++)
+        {
+          currentPart = [subparts objectAtIndex: i];
+          if ([self _isSmimeEncrypted: currentPart])
+            return YES;
+        }
+    }
+  else if ([type isEqualToString: @"application"] && ([subtype isEqualToString: @"pkcs7-mime"] ||
+           [subtype isEqualToString: @"x-pkcs7-mime"]))
+    return YES;
+
+  return NO;
+}
+
+- (BOOL) _isPGP: (NSDictionary *) thePart
+{
+  NSMutableDictionary *currentPart;
+  NSArray *subparts;
+  NSString *type, *subtype, *protocol;
+  NSUInteger i;
+
+  type = [[thePart objectForKey: @"type"] lowercaseString];
+  subtype = [[thePart objectForKey: @"subtype"] lowercaseString];
+  protocol = [[[thePart objectForKey: @"parameterList"] objectForKey: @"protocol"] lowercaseString];
+
+  if ([type isEqualToString: @"multipart"])
+    {
+      if (([protocol isEqualToString: @"application/pgp-signature"] || [protocol isEqualToString: @"application/pgp-encrypted"]))
+        return YES;
+
+      subparts = [thePart objectForKey: @"parts"];
+      for (i = 0; i < [subparts count]; i++)
+        {
+          currentPart = [subparts objectAtIndex: i];
+          if ([self _isPGP: currentPart])
+            return YES;
+        }
+    }
+  else if ([type isEqualToString: @"application"] && [subtype isEqualToString: @"pgp-encrypted"])
+    return YES;
+
+  return NO;
+}
+
 //
 //
 //
 - (NSData *) _preferredBodyDataUsingType: (int) theType
+                              mimeSupport: (int) theMimeSupport
                              nativeType: (int *) theNativeType
 {
  NSString *type, *subtype, *encoding;
  NSData *d;
+  BOOL isSMIME, sanitinizeNeeded;
  
  type = [[[self bodyStructure] valueForKey: @"type"] lowercaseString];
  subtype = [[[self bodyStructure] valueForKey: @"subtype"] lowercaseString];
-
+  isSMIME = NO;
  d = nil;
  
  // We determine the native type
@@ -458,8 +608,16 @@ struct GlobalObjectId {
  else if ([type isEqualToString: @"multipart"])
    *theNativeType = 4;

+  if (([self _isSigned: [self bodyStructure]] ||
+       [self _isSmimeEncrypted: [self bodyStructure]] ||
+       [self _isPGP: [self bodyStructure]]) && theMimeSupport > 0)
+    {
+      *theNativeType = 4;
+      isSMIME = YES;
+    }
+
  // We get the right part based on the preference
-  if (theType == 1 || theType == 2)
+  if ((theType == 1 || theType == 2) && !isSMIME)
    {
      if ([type isEqualToString: @"text"] && ![subtype isEqualToString: @"calendar"])
        {
@@ -500,12 +658,12 @@ struct GlobalObjectId {
          d = [self _preferredBodyDataInMultipartUsingType: theType nativeTypeFound: theNativeType];
        }
    }
-  else if (theType == 4)
+  else if (theType == 4 || isSMIME)
    {
-      // We sanitize the content *ONLY* for Outlook clients and if the content-transfer-encoding is 8bit. Outlook has strange issues
-      // with quoted-printable/base64 encoded text parts. It just doesn't decode them.
-      encoding = [[self lookupInfoForBodyPart: @""] objectForKey: @"encoding"];
-      if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15"] || ([encoding caseInsensitiveCompare: @"8bit"] == NSOrderedSame))
+      // We sanitize the content if the content-transfer-encoding is 8bit and charset is not utf-8 or us-ascii.
+      sanitinizeNeeded = [self _sanitinizeNeeded: [NSArray arrayWithObject: [self bodyStructure]]];
+
+      if (sanitinizeNeeded && !isSMIME)
        d = [self _sanitizedMIMEMessage];
      else
        d = [self content];
@@ -514,6 +672,57 @@ struct GlobalObjectId {
  return d;
 }

+
+- (NSString *) _getNormalizedSubject
+{
+  NSString *subject;
+  NSUInteger colIdx;
+  NSString *stringValue;
+
+  subject = [[self subject] decodedHeader];
+
+  colIdx = [subject rangeOfString: @":" options:NSBackwardsSearch].location;
+  if (colIdx != NSNotFound && colIdx + 1 < [subject length])
+    stringValue = [[subject substringFromIndex: colIdx + 1] stringByTrimmingLeadSpaces];
+  else
+    stringValue = subject;
+
+  if (!stringValue)
+    stringValue = @"";
+
+  return stringValue;
+}
+
+
+- (NSString *) _truncateContent: (NSString *) theContent
+                          limit: (int) theLimit
+                      truncated: (int *) wasTruncated
+{
+  if ([theContent length] > theLimit)
+    {
+      int i, len;
+
+      theContent = [theContent substringToIndex: theLimit];
+      *wasTruncated = 1;
+
+      // We search for the first "space" character starting from the
+      // end and we truncate the string once more. We do this to avoid
+      // truncating the content in the middle of a XML entity
+      len = theLimit-1;
+
+      for (i = len; i >= 0; i--)
+        {
+          if (isspace([theContent characterAtIndex: i]))
+            break;
+        }
+
+      return [theContent substringToIndex: i];
+    }
+
+  *wasTruncated = 0;
+  return theContent;
+}
+
 //
 //
 //
@@ -573,7 +782,7 @@ struct GlobalObjectId {
                  iCalCalendar *calendar;
                  NSData *calendarData;
                  
-                  calendarData = [bodyPart fetchBLOB];
+                  calendarData = [bodyPart fetchBLOBWithPeek: YES];
                  calendar = nil;

                  NS_DURING
@@ -598,16 +807,17 @@ struct GlobalObjectId {
 {
  NSData *d, *globalObjId;
  NSArray *attachmentKeys;
-  NSMutableString *s;
-
-  uint32_t v;
-  NSString *p;
-  
-  id value;
-
  iCalCalendar *calendar;
+  NSString *p;
+  NSMutableString *s;
+  id value;
      
-  int preferredBodyType, nativeBodyType;
+  int preferredBodyType, mimeSupport, mimeTruncation, nativeBodyType;
+  uint32_t v;
+
+  preferredBodyType = [[context objectForKey: @"BodyPreferenceType"] intValue];
+  mimeSupport = [[context objectForKey: @"MIMESupport"] intValue];
+  mimeTruncation = [[context objectForKey: @"MIMETruncation"] intValue];

  s = [NSMutableString string];

@@ -627,7 +837,7 @@ struct GlobalObjectId {
  if (value)
    {
      [s appendFormat: @"<Subject xmlns=\"Email:\">%@</Subject>", [value activeSyncRepresentationInContext: context]];
-      [s appendFormat: @"<ThreadTopic xmlns=\"Email:\">%@</ThreadTopic>", [value activeSyncRepresentationInContext: context]];
+      [s appendFormat: @"<ThreadTopic xmlns=\"Email:\">%@</ThreadTopic>", [[self _getNormalizedSubject] activeSyncRepresentationInContext: context]];
    }

  // DateReceived
@@ -793,7 +1003,7 @@ struct GlobalObjectId {
      [s appendFormat: @"<GlobalObjId xmlns=\"Email:\">%@</GlobalObjId>", [globalObjId activeSyncRepresentationInContext: context]];

      // We set the right message type - we must set AS version to 14.1 for this
-      if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"14.1"])
+      if ([[context valueForKey: @"ASProtocolVersion"] floatValue] >= 14.1)
        [s appendFormat: @"<MeetingMessageType xmlns=\"Email2:\">%d</MeetingMessageType>", 1];

      [s appendString: @"</MeetingRequest>"];
@@ -804,7 +1014,13 @@ struct GlobalObjectId {
  else
    {
      // MesssageClass and ContentClass
-      [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note"];
+      if ([self _isSigned: [self bodyStructure]])
+        [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note.SMIME.MultipartSigned"];
+      else if ([self _isSmimeEncrypted: [self bodyStructure]])
+        [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note.SMIME"];
+      else
+        [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note"];
+
      [s appendFormat: @"<ContentClass xmlns=\"Email:\">%@</ContentClass>", @"urn:content-classes:message"];
    }

@@ -818,10 +1034,8 @@ struct GlobalObjectId {
  [s appendFormat: @"<InternetCPID xmlns=\"Email:\">%@</InternetCPID>", @"65001"];
          
  // Body - namespace 17
-  preferredBodyType = [[context objectForKey: @"BodyPreferenceType"] intValue];
-
  nativeBodyType = 1;
-  d = [self _preferredBodyDataUsingType: preferredBodyType  nativeType: &nativeBodyType];
+  d = [self _preferredBodyDataUsingType: preferredBodyType  mimeSupport: mimeSupport  nativeType: &nativeBodyType];

  if (calendar && !d)
    {
@@ -910,44 +1124,87 @@ struct GlobalObjectId {
      AUTORELEASE(content);
      
      content = [content activeSyncRepresentationInContext: context];
+      len = [content length];
      truncated = 0;

-      len = [content length];
+      // We handle MIMETruncation
+      switch (mimeTruncation)
+        {
+        case 0:
+          {
+            content = @"";
+            len = 0; truncated = 1;
+          }
+          break;
+        case 1:
+          content = [self _truncateContent: content  limit: 4096  truncated: &truncated];
+          len = [content length];
+          break;
+        case 2:
+          content = [self _truncateContent: content  limit: 5120  truncated: &truncated];
+          len = [content length];
+          break;
+        case 3:
+          content = [self _truncateContent: content  limit: 7168  truncated: &truncated];
+          len = [content length];
+          break;
+        case 4:
+          content = [self _truncateContent: content  limit: 10240  truncated: &truncated];
+          len = [content length];
+          break;
+        case 5:
+          content = [self _truncateContent: content  limit: 20480  truncated: &truncated];
+          len = [content length];
+          break;
+        case 6:
+          content = [self _truncateContent: content  limit: 51200  truncated: &truncated];
+          len = [content length];
+          break;
+        case 7:
+          content = [self _truncateContent: content  limit: 102400  truncated: &truncated];
+          len = [content length];
+          break;
+        case 8:
+        default:
+          truncated = 0;
+        }

-      if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+      if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
        {
          [s appendFormat: @"<Body xmlns=\"Email:\">%@</Body>", content];
          [s appendFormat: @"<BodyTruncated xmlns=\"Email:\">%d</BodyTruncated>", truncated];
        }
      else
-       {
+        {
          [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];

-          // Set the correct type if client requested text/html but we got text/plain
+          // Set the correct type if client requested text/html but we got text/plain.
+          // For s/mime mails type is always 4 if mimeSupport is 1 or 2.
          if (preferredBodyType == 2 && nativeBodyType == 1)
             [s appendString: @"<Type>1</Type>"];
+          else if (([self _isSigned: [self bodyStructure]] ||
+                    [self _isSmimeEncrypted: [self bodyStructure]] ||
+                    [self _isPGP: [self bodyStructure]]) && mimeSupport > 0)
+             [s appendString: @"<Type>4</Type>"];
          else
             [s appendFormat: @"<Type>%d</Type>", preferredBodyType];

          [s appendFormat: @"<Truncated>%d</Truncated>", truncated];
          [s appendFormat: @"<Preview></Preview>"];
-
-          if (!truncated)
-            {
-              [s appendFormat: @"<Data>%@</Data>", content];
-              [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", len];
-            }
+          [s appendFormat: @"<Data>%@</Data>", content];
+          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", len];
          [s appendString: @"</Body>"];
       }
    }
-  
+
  // Attachments -namespace 16
  attachmentKeys = [self fetchFileAttachmentKeys];
-  if ([attachmentKeys count])
+
+  if ([attachmentKeys count] && !([self _isSigned: [self bodyStructure]]))
    {
      int i;

-      if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+      if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
        [s appendString: @"<Attachments xmlns=\"Email:\">"];
      else
        [s appendString: @"<Attachments xmlns=\"AirSyncBase:\">"];
@@ -962,18 +1219,24 @@ struct GlobalObjectId {
          // FileReference must be a unique identifier across the whole store. We use the following structure:
          // mail/<foldername>/<message UID/<pathofpart>
          // mail/INBOX/2          
-          if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+          if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
            [s appendFormat: @"<AttName>mail/%@/%@/%@</AttName>", [[[self container] relativeImap4Name] stringByEscapingURL], [self nameInContainer], [value objectForKey: @"path"]];
          else
            [s appendFormat: @"<FileReference>mail/%@/%@/%@</FileReference>", [[[self container] relativeImap4Name] stringByEscapingURL], [self nameInContainer], [value objectForKey: @"path"]];

-          if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+          if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
            {
              [s appendFormat: @"<AttMethod>%d</AttMethod>", 1];
              [s appendFormat: @"<AttSize>%d</AttSize>", [[value objectForKey: @"size"] intValue]];
            }
          else
            {
+              if ([[value objectForKey: @"bodyId"] length])
+                {
+                  [s appendFormat: @"<ContentId>%@</ContentId>", [[value objectForKey: @"bodyId"] activeSyncRepresentationInContext: context]];
+                  [s appendFormat: @"<IsInline>%d</IsInline>", 1];
+                }
+
              [s appendFormat: @"<Method>%d</Method>", 1]; // See: http://msdn.microsoft.com/en-us/library/ee160322(v=exchg.80).aspx
              [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [[value objectForKey: @"size"] intValue]];
              //[s appendFormat: @"<IsInline>%d</IsInline>", 1];
@@ -1010,12 +1273,23 @@ struct GlobalObjectId {
      [s appendFormat: @"</Categories>"];
    }
  
-  if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"14.0"] ||
-      [[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"14.1"])
+    if ([[context valueForKey: @"ASProtocolVersion"] floatValue] >= 14.0)
    {
-      if ([self inReplyTo])
+      id value;
+      NSString *reference;
+
+      value = [[self mailHeaders] objectForKey: @"references"];
+
+      if ([value isKindOfClass: [NSArray class]])
+         reference = [[[value objectAtIndex: 0] componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] objectAtIndex: 0];
+      else
+         reference = [[value componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] objectAtIndex: 0];
+
+      if ([reference length] > 0)
+        [s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[reference dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
+      else if ([[self inReplyTo] length] > 0)
        [s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[[self inReplyTo] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
-      else if ([self messageId])
+      else if ([[self messageId] length] > 0)
        [s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[[self messageId] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
    }

@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@interface SOGoSyncCacheObject : NSObject
 {
+  @public
  id _uid;
  id _sequence;
 }
@@ -32,9 +32,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #import <Foundation/NSNull.h>
 #import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
+
+static Class NSNullK;

@implementation SOGoSyncCacheObject

+ (void) initialize
+{
+  NSNullK = [NSNull class];
+}
+
 - (id) init
 {
  if ((self = [super init]))
@@ -46,14 +54,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  return self;
 }

-+ (id) syncCacheObjectWithUID: (id) theUID  sequence:  (id) theSequence;
+ (id) syncCacheObjectWithUID: (id) theUID  sequence:  (id) theSequence
 {
  id o;

  o = [[self alloc] init];
- 
-  [o setUID: theUID];
-  [o setSequence: theSequence];
+
+  [o setUID: [NSNumber numberWithInt: [theUID intValue]]];
+  [o setSequence: ([theSequence isKindOfClass: NSNullK] ? theSequence : [NSNumber numberWithInt: [theSequence intValue]])];
  
  return [o autorelease];
 }
@@ -67,7 +75,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 - (id) uid
 {
-  return _uid;
+  return [_uid description];
 }

 - (void) setUID: (id) theUID
@@ -77,7 +85,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 - (id) sequence
 {
-  return _sequence;
+  return ([_sequence isKindOfClass: NSNullK] ? _sequence : [_sequence description]);
 }

 - (void) setSequence: (id) theSequence
@@ -88,7 +96,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 - (NSComparisonResult) compareUID: (SOGoSyncCacheObject *) theSyncCacheObject
 {
-  return [[self uid] compare: [theSyncCacheObject uid]];
+  return [self->_uid compare: theSyncCacheObject->_uid];
 }

 //
@@ -97,21 +105,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 - (NSComparisonResult) compareSequence: (SOGoSyncCacheObject *) theSyncCacheObject
 {
-  if ([[self sequence] isEqual: [NSNull null]] &&
-      [[theSyncCacheObject sequence] isEqual: [NSNull null]])
+  if ([self->_sequence isEqual: [NSNull null]] &&
+      [theSyncCacheObject->_sequence isEqual: [NSNull null]])
    return [self compareUID: theSyncCacheObject];
  
-  if (![[self sequence] isEqual: [NSNull null]] && [[theSyncCacheObject sequence] isEqual: [NSNull null]])
+  if (![self->_sequence isEqual: [NSNull null]] && [theSyncCacheObject->_sequence isEqual: [NSNull null]])
    return NSOrderedDescending;
  
-  if ([[self sequence] isEqual: [NSNull null]] && ![[theSyncCacheObject sequence] isEqual: [NSNull null]])
+  if ([self->_sequence isEqual: [NSNull null]] && ![theSyncCacheObject->_sequence isEqual: [NSNull null]])
    return NSOrderedAscending;
  
  // Must check this here, to avoid comparing NSNull objects
-  if ([[self sequence] compare: [theSyncCacheObject sequence]] == NSOrderedSame)
+  if ([self->_sequence compare: theSyncCacheObject->_sequence] == NSOrderedSame)
    return [self compareUID: theSyncCacheObject];
  
-  return [[self sequence] compare: [theSyncCacheObject sequence]];
+  return [self->_sequence compare: theSyncCacheObject->_sequence];
 }

 - (NSString *) description
@@ -120,3 +128,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 }

@end
+
@@ -58,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      
      // don't send negative reminder - not supported
      if (delta > 0)
-        [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", delta];
+        [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", (int)delta];
    }
  
  return s;
@@ -41,7 +41,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
 - (void) takeActiveSyncValues: (NSDictionary *) theValues
                    inContext: (WOContext *) context;
-
+- (void) changeParticipationStatus: (NSDictionary *) theValues
+                         inContext: (WOContext *) context
+                         component: (id) component;
@end

 #endif
@@ -38,6 +38,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <Foundation/NSTimeZone.h>

 #import <NGExtensions/NSString+misc.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
@@ -45,11 +47,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalPerson.h>
+#import <NGCards/NSCalendarDate+NGCards.h>
+#import <NGCards/NSString+NGCards.h>
+#import <NGCards/iCalCalendar.h>

 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
+#import <SOGo/WORequest+SOGo.h>

 #import <Appointments/iCalEntityObject+SOGo.h>
+#import <Appointments/iCalRepeatableEntityObject+SOGo.h>
+#import <Appointments/SOGoAppointmentObject.h>

 #include "iCalAlarm+ActiveSync.h"
 #include "iCalRecurrenceRule+ActiveSync.h"
@@ -62,7 +70,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (int) _attendeeStatus: (iCalPerson *) attendee
 {
  int  attendee_status;
-  
+
  attendee_status = 5;
  if ([[attendee partStat] caseInsensitiveCompare: @"ACCEPTED"] == NSOrderedSame)
    attendee_status = 3;
@@ -74,6 +82,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  return attendee_status;
 }

+//
+// Possible values are:
+// 0  Free
+// 1  Tentative
+// 2  Busy
+// 3  Out of Office
+// 4  Working elsewhere
+//
+- (int) _busyStatus: (iCalPerson *) attendee
+{
+  int  attendee_status;
+
+  attendee_status = 2;
+
+  if ([[attendee partStat] caseInsensitiveCompare: @"DECLINED"] == NSOrderedSame)
+    attendee_status = 0;
+  else if ([[attendee partStat] caseInsensitiveCompare: @"TENTATIVE"] == NSOrderedSame)
+    attendee_status = 1;
+
+  return attendee_status;
+}
+
+
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
  NSMutableString *s;
@@ -98,10 +129,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  else if ([self created])
    [s appendFormat: @"<DTStamp xmlns=\"Calendar:\">%@</DTStamp>", [[self created] activeSyncRepresentationWithoutSeparatorsInContext: context]];
  
+  // Timezone
+  tz = [(iCalDateTime *)[self firstChildWithTag: @"dtstart"] timeZone];
+
  // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
  if ([self startDate])
    {
-      if ([self isAllDay])
+      if ([self isAllDay] && !tz)
        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>",
           [[[self startDate] dateByAddingYears: 0 months: 0 days: 0
                                          hours: 0 minutes: 0
@@ -114,7 +148,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // EndTime -- http://msdn.microsoft.com/en-us/library/ee157945(v=exchg.80).aspx
  if ([self endDate])
    {
-      if ([self isAllDay])
+      if ([self isAllDay] && !tz)
        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>",
           [[[self endDate] dateByAddingYears: 0 months: 0 days: 0
                                        hours: 0 minutes: 0
@@ -124,26 +158,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>", [[self endDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
    }

-  // Timezone
-  tz = [(iCalDateTime *)[self firstChildWithTag: @"dtstart"] timeZone];
-
  if (!tz)
    tz = [iCalTimeZone timeZoneForName: [userTimeZone name]];

-  [s appendFormat: @"<TimeZone xmlns=\"Calendar:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
+  if (![self recurrenceId])
+    [s appendFormat: @"<TimeZone xmlns=\"Calendar:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
  
  // Organizer and other invitations related properties
  if ((organizer = [self organizer]))
    {
      meetingStatus = 1;  // meeting and the user is the meeting organizer.
      o = [organizer rfc822Email];
-      if ([o length])
+      if (![self recurrenceId] && [o length])
        {
          [s appendFormat: @"<Organizer_Email xmlns=\"Calendar:\">%@</Organizer_Email>", o];
          
          o = [organizer cn];
          if ([o length])
-            [s appendFormat: @"<Organizer_Name xmlns=\"Calendar:\">%@</Organizer_Name>", o];
+            [s appendFormat: @"<Organizer_Name xmlns=\"Calendar:\">%@</Organizer_Name>", [o activeSyncRepresentationInContext: context]];
        }
    }
  
@@ -181,7 +213,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
   else
    {
-      meetingStatus = 0;  // appointment
+      meetingStatus = 0;  // The event is an appointment, which has no attendees.
    }
  
  // This depends on the 'NEEDS-ACTION' parameter.
@@ -202,6 +234,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendFormat: @"<DisallowNewTimeProposal xmlns=\"Calendar:\">%d</DisallowNewTimeProposal>", 1];
      
      // BusyStatus -- http://msdn.microsoft.com/en-us/library/ee202290(v=exchg.80).aspx
+      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>",  [self _busyStatus: attendee]];
+    }
+  else
+    {
+      // If it's a normal event (ie, with no organizer/attendee) or we are the organizer to an event
+      // invitation, we set the busy status to 2 (Busy)
      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>", 2];
    }

@@ -226,9 +264,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  //[s appendFormat: @"<Importance xmlns=\"Calendar:\">%d</Importance>", v];

  // UID -- http://msdn.microsoft.com/en-us/library/ee159919(v=exchg.80).aspx
-  if ([[self uid] length])
-    [s appendFormat: @"<UID xmlns=\"Calendar:\">%@</UID>", [self uid]];
-  
+  if (![self recurrenceId] && [[self uid] length])
+    [s appendFormat: @"<UID xmlns=\"Calendar:\">%@</UID>", [[self uid] activeSyncRepresentationInContext: context]];
+
+  // Recurrence rules
+  if ([self isRecurrent])
+    [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
+
+  // Comment
+  o = [self comment];
+  //if (![self recurrenceId] && [o length])
+  if ([o length])
+    {
+      // It is very important here to NOT set <Truncated>0</Truncated> in the response,
+      // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details.
+      o = [o activeSyncRepresentationInContext: context];
+
+      if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
+        {
+          [s appendFormat: @"<Body xmlns=\"Calendar:\">%@</Body>", o];
+          [s appendString: @"<BodyTruncated xmlns=\"Calendar:\">0</BodyTruncated>"];
+        }
+      else
+        {
+          [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+          [s appendFormat: @"<Type>%d</Type>", 1];
+          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>",  (int)[o length]];
+          [s appendFormat: @"<Data>%@</Data>", o];
+          [s appendString: @"</Body>"];
+       }
+    }
+
  // Sensitivity
  if ([[self accessClass] isEqualToString: @"PRIVATE"])
    v = 2;
@@ -251,7 +317,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendFormat: @"</Categories>"];
    }

-  
  // Reminder -- http://msdn.microsoft.com/en-us/library/ee219691(v=exchg.80).aspx
  // TODO: improve this to handle more alarm types
  if ([self hasAlarms]) 
@@ -262,36 +327,79 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendString: [alarm activeSyncRepresentationInContext: context]];
    }

-  // Recurrence rules
+  // Exceptions
  if ([self isRecurrent])
    {
-      [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
-    }
+      NSMutableArray *components, *exdates;
+      iCalEvent *current_component;
+      NSString *recurrence_id;

-  // Comment
-  o = [self comment];
-  if ([o length])
-    {
-      // It is very important here to NOT set <Truncated>0</Truncated> in the response,
-      // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details.
-      o = [o activeSyncRepresentationInContext: context];
+      unsigned int count, max, i;

-      if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+      components = [NSMutableArray arrayWithArray: [[self parent] events]];
+      max = [components count];
+
+      if (max > 1 || [self hasExceptionDates])
        {
-          [s appendFormat: @"<Body xmlns=\"Calendar:\">%@</Body>", o];
-          [s appendString: @"<BodyTruncated xmlns=\"Calendar:\">0</BodyTruncated>"];
+          exdates = [NSMutableArray arrayWithArray: [self exceptionDates]];
+
+          [s appendString: @"<Exceptions xmlns=\"Calendar:\">"];
+
+          for (count = 1; count < max; count++)
+            {
+              current_component = [components objectAtIndex: count] ;
+
+              if ([self isAllDay])
+                {
+                  recurrence_id = [NSString stringWithFormat: @"%@",
+                                            [[[current_component recurrenceId] dateByAddingYears: 0 months: 0 days: 0
+                                                                                           hours: 0 minutes: 0
+                                                                                         seconds: -[userTimeZone secondsFromGMTForDate:
+                                                                                                                   [current_component recurrenceId]]]
+                                              activeSyncRepresentationWithoutSeparatorsInContext: context]];
+                }
+              else
+                {
+                  recurrence_id = [NSString stringWithFormat: @"%@", [[current_component recurrenceId]
+                                                                       activeSyncRepresentationWithoutSeparatorsInContext: context]];
+                }
+
+              [s appendString: @"<Exception>"];
+              [s appendFormat: @"<Exception_StartTime xmlns=\"Calendar:\">%@</Exception_StartTime>", recurrence_id];
+              [s appendFormat: @"%@", [current_component activeSyncRepresentationInContext: context]];
+              [s appendString: @"</Exception>"];
+            }
+
+          for (i = 0; i < [exdates count]; i++)
+            {
+              [s appendString: @"<Exception>"];
+              [s appendString: @"<Exception_Deleted>1</Exception_Deleted>"];
+
+              if ([self isAllDay])
+                {
+                  recurrence_id = [NSString stringWithFormat: @"%@",
+                                   [[[[exdates objectAtIndex: i] asCalendarDate] dateByAddingYears: 0 months: 0 days: 0
+                                                                                             hours: 0 minutes: 0
+                                                                                           seconds: -[userTimeZone secondsFromGMTForDate:
+                                                                                                                 [[exdates objectAtIndex: i] asCalendarDate]]]
+                                     activeSyncRepresentationWithoutSeparatorsInContext: context]];
+                }
+              else
+                {
+                  recurrence_id = [NSString stringWithFormat: @"%@", [[[exdates objectAtIndex: i] asCalendarDate]
+                                                                       activeSyncRepresentationWithoutSeparatorsInContext: context]];
+                }
+
+              [s appendFormat: @"<Exception_StartTime xmlns=\"Calendar:\">%@</Exception_StartTime>", recurrence_id];
+              [s appendString: @"</Exception>"];
+            }
+
+            [s appendString: @"</Exceptions>"];
        }
-      else
-        {
-          [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
-          [s appendFormat: @"<Type>%d</Type>", 1];
-          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
-          [s appendFormat: @"<Data>%@</Data>", o];
-          [s appendString: @"</Body>"];
-       }
    }

-  [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", 1];
+  if (![self recurrenceId])
+    [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", 1];

  return s;
 }
@@ -337,13 +445,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (void) takeActiveSyncValues: (NSDictionary *) theValues
                    inContext: (WOContext *) context
 {
-  iCalDateTime *start, *end;
+  iCalDateTime *start, *end; //, *oldstart;
+  NSCalendarDate *oldstart;
  NSTimeZone *userTimeZone;
  iCalTimeZone *tz;
  id o;
+  int deltasecs;

  BOOL isAllDay;
-  
+
+  NSMutableArray *occurences;
+
+  occurences = [NSMutableArray arrayWithArray: [[self parent] events]];
+
  if ((o = [theValues objectForKey: @"UID"]))
    [self setUid: o];
    
@@ -356,6 +470,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      isAllDay = YES;
    }
+  else if ([occurences count] && !([theValues objectForKey: @"AllDayEvent"]))
+    {
+      // If the occurence has no AllDay tag use it from master.
+      isAllDay = [[occurences objectAtIndex: 0] isAllDay];
+    }

  //
  // 0- free, 1- tentative, 2- busy and 3- out of office
@@ -404,7 +523,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
  
  // FIXME: merge with iCalToDo
-  if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+  if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
    {
      if ((o = [theValues objectForKey: @"Body"]))
        [self setComment: o];
@@ -418,14 +537,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  if ((o = [theValues objectForKey: @"Location"]))
    [self setLocation: o];

+  deltasecs = 0;
+  start = nil;
+
  if ((o = [theValues objectForKey: @"StartTime"]))
    {
      o = [o calendarDate];
      start = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
+      oldstart = [start dateTime];
      [start setTimeZone: tz];

-       if (isAllDay)
-         {
+      if (isAllDay)
+	{
          [start setDate: o];
          [start setTimeZone: nil];
        }
@@ -433,6 +556,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        {
          [start setDateTime: o];
        }
+
+      // Calculate delta if start date has been changed.
+      if (oldstart)
+	deltasecs = [[start dateTime ] timeIntervalSinceDate: oldstart] * -1;
    }

  if ((o = [theValues objectForKey: @"EndTime"]))
@@ -491,6 +618,177 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      RELEASE(rule);
      
      [rule takeActiveSyncValues: o  inContext: context];
+
+      // Exceptions
+      if ((o = [theValues objectForKey: @"Exceptions"]) && [o isKindOfClass: [NSArray class]])
+        {
+          NSCalendarDate *recurrenceId, *adjustedRecurrenceId, *currentId;
+          NSMutableArray *exdates, *exceptionstouched;
+          iCalEvent *currentOccurence;
+          NSDictionary *exception;
+
+          unsigned int i, count, max;
+
+          [self removeAllExceptionDates];
+
+          exdates = [NSMutableArray array];
+          exceptionstouched = [NSMutableArray array];
+
+          for (i = 0; i < [o count]; i++)
+            {
+              exception = [o objectAtIndex: i];
+
+              if (![[exception objectForKey: @"Exception_Deleted"] intValue])
+                {
+                  recurrenceId = [[exception objectForKey: @"Exception_StartTime"] asCalendarDate];
+
+                  if (isAllDay)
+                    recurrenceId = [recurrenceId dateByAddingYears: 0 months: 0 days: 0
+                                                             hours: 0 minutes: 0
+                                                           seconds: [userTimeZone secondsFromGMTForDate:recurrenceId]];
+
+                  // When moving the calendar entry (i.e. changing the startDate) iOS and Android sometimes send a value for
+                  // Exception_StartTime which is not what we expect.
+                  // With this we make sure the recurrenceId is always correct.
+                  //
+                  // iOS problem - If the master is a no-allday-event but the exception is, an invalid Exception_StartTime is in the request.
+                  // e.g. it sends 20150409T040000Z instead of 20150409T060000Z;
+                  // This might be a special case since iPhone doesn't allow an allday-exception on a non-allday-event.
+                  if (!([[start dateTime] compare: [[start dateTime] hour:[recurrenceId hourOfDay] minute:[recurrenceId minuteOfHour]]] == NSOrderedSame))
+                    recurrenceId = [recurrenceId hour:[[start dateTime] hourOfDay] minute:[[start dateTime] minuteOfHour]];
+
+                  // We need to store the recurrenceIds and exception dates adjusted by deltasecs.
+                  // This ensures that the adjustment in SOGoCalendarComponent->updateComponent->_updateRecurrenceIDsWithEvent gives the correct dates.
+                  adjustedRecurrenceId = [recurrenceId dateByAddingYears: 0 months: 0 days: 0
+                                                                   hours: 0 minutes: 0 seconds: deltasecs];
+
+                  // search for an existing occurence and update it
+                  max = [occurences count];
+                  currentOccurence = nil;
+                  count = 1;
+                  while (count < max)
+                    {
+                      currentOccurence = [occurences objectAtIndex: count] ;
+                      currentId = [currentOccurence recurrenceId];
+
+                      if ([currentId compare: adjustedRecurrenceId] == NSOrderedSame)
+                        {
+                          [exceptionstouched addObject: adjustedRecurrenceId];
+                          [currentOccurence takeActiveSyncValues: exception  inContext: context];
+
+                          break;
+                        }
+
+                      count++;
+                      currentOccurence = nil;
+                    }
+
+                  // Create a new occurence if we found none to update.
+                  if (!currentOccurence)
+                    {
+                      iCalDateTime *recid;
+
+                      currentOccurence = [self mutableCopy];
+                      [currentOccurence removeAllRecurrenceRules];
+                      [currentOccurence removeAllExceptionRules];
+                      [currentOccurence removeAllExceptionDates];
+
+                      [[self parent] addToEvents: currentOccurence];
+                      [currentOccurence takeActiveSyncValues: exception  inContext: context];
+
+                      recid = (iCalDateTime *)[currentOccurence uniqueChildWithTag: @"recurrence-id"];
+                      if (isAllDay)
+                        [recid setDate: adjustedRecurrenceId];
+                      else
+                        [recid setDateTime: adjustedRecurrenceId];
+
+                      [exceptionstouched addObject: [recid dateTime]];
+                    }
+                }
+              else if ([[exception objectForKey: @"Exception_Deleted"] intValue])
+                {
+                  recurrenceId = [[exception objectForKey: @"Exception_StartTime"] asCalendarDate];
+
+                  if (isAllDay)
+                    recurrenceId = [recurrenceId dateByAddingYears: 0 months: 0
+                                                              days: 0 hours: 0 minutes: 0
+                                                           seconds: [userTimeZone secondsFromGMTForDate:recurrenceId]];
+
+                  // We add only valid exception dates.
+                  if ([self doesOccurOnDate: recurrenceId] &&
+                      ([[start dateTime] compare: [[start dateTime] hour:[recurrenceId hourOfDay]
+                                                                  minute:[recurrenceId minuteOfHour]]] == NSOrderedSame))
+                    {
+                      // We need to store the recurrenceIds and exception dates adjusted by deltasecs.
+                      // This ensures that the adjustment in SOGoCalendarComponent->updateComponent->_updateRecurrenceIDsWithEvent gives the correct dates.
+                      [exdates addObject: [recurrenceId dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 0 seconds: deltasecs]];
+                    }
+                }
+            }
+
+          // Update exception dates in master event.
+          max = [exdates count];
+          if (max > 0)
+            {
+              for (count = 0; count < max; count++)
+                {
+                  if (([exceptionstouched indexOfObject: [exdates objectAtIndex: count]] == NSNotFound))
+                    [self addToExceptionDates: [exdates objectAtIndex: count]];
+                }
+            }
+
+          // Remove all exceptions included in the request.
+          max = [occurences count];
+          count = 1; // skip the master event
+          while (count < max)
+            {
+              currentOccurence = [occurences objectAtIndex: count] ;
+              currentId = [currentOccurence recurrenceId];
+
+              // Delete all occurences which are not touched (modified/added).
+              if (([exceptionstouched indexOfObject: currentId] == NSNotFound))
+                [[[self parent] children] removeObject: currentOccurence];
+
+              count++;
+            }
+        }
+      else if ([self isRecurrent])
+        {
+          // We have no exceptions in request but there is a recurrence rule.
+          // Remove all excpetions and exception dates.
+          iCalEvent *currentOccurence;
+          unsigned int count, max;
+
+          [self removeAllExceptionDates];
+          max = [occurences count];
+          count = 1; // skip the master event
+          while (count < max)
+            {
+              currentOccurence = [occurences objectAtIndex: count];
+              [[[self parent] children] removeObject: currentOccurence];
+              count++;
+            }
+        }
+    }
+  else if ([self isRecurrent])
+    {
+      // We have no recurrence rule in request.
+      // Remove all exceptions, exception dates and recurrence rules.
+      iCalEvent *currentOccurence;
+      unsigned int count, max;
+
+      [self removeAllRecurrenceRules];
+      [self removeAllExceptionRules];
+      [self removeAllExceptionDates];
+
+      max = [occurences count];
+      count = 1; // skip the master event
+      while (count < max)
+        {
+          currentOccurence = [occurences objectAtIndex: count];
+          [[[self parent] children] removeObject: currentOccurence];
+          count++;
+        }
    }

  // Organizer - we don't touch the value unless we're the organizer
@@ -498,7 +796,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      ([self userIsOrganizer: [context activeUser]] || [[context activeUser] hasEmail: o]))
    {
      iCalPerson *person;
-      
+
      person = [iCalPerson elementWithTag: @"organizer"];
      [person setEmail: o];
      [person setCn: [theValues objectForKey: @"Organizer_Name"]];
@@ -546,7 +844,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      // Windows phones sens sometimes an empty Attendees tag.
      // We check it's an array before processing it.
-      if ((o = [theValues objectForKey: @"Attendees"])&& [o isKindOfClass: [NSArray class]])
+      if ((o = [theValues objectForKey: @"Attendees"]) && [o isKindOfClass: [NSArray class]])
        {
          NSMutableArray *attendees;
          NSDictionary *attendee;
@@ -595,4 +893,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
 }

+- (void) changeParticipationStatus: (NSDictionary *) theValues
+                         inContext: (WOContext *) context
+                         component: (id) component
+{
+  NSString *status;
+  id o;
+
+  // See: https://msdn.microsoft.com/en-us/library/ee202290(v=exchg.80).aspx
+  //
+  // 0 == Free
+  // 1 == Tentative
+  // 2 == Busy
+  // 3 == Out of Office
+  // 4 == Working elsehwere
+  //
+  if ((o = [theValues objectForKey: @"BusyStatus"]))
+    {
+      // We translate >= 2 into ACCEPTED
+      if ([o intValue] == 0)
+        status = @"NEEDS-ACTION";
+      else if ([o intValue] >= 2)
+        status = @"ACCEPTED";
+      else
+        status = @"TENTATIVE";
+
+      // There's no delegate in EAS
+      [(SOGoAppointmentObject *) component changeParticipationStatus: status
+                                                        withDelegate: nil
+                                                               alarm: nil];
+    }
+}
+
@end
@@ -140,7 +140,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          // Simple reccurrence rule of type "Monthly"
          type = 2;
          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
-             [[[self parent] startDate] dayOfMonth]];
+             (int)[[[self parent] startDate] dayOfMonth]];
        }
    }
  else if ([self frequency] == iCalRecurrenceFrequenceYearly)
@@ -176,7 +176,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            }
        }
      else
-        type = 5;
+        {
+          type = 5;
+          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
+             (int)[[[self parent] startDate] dayOfMonth]];
+          [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%d</Recurrence_MonthOfYear>",
+             (int)[[[self parent] startDate] monthOfYear]];
+
+        }
    }
  
  [s appendFormat: @"<Recurrence_Type xmlns=\"Calendar:\">%d</Recurrence_Type>", type];
@@ -131,7 +131,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      // otherwise it'll prevent WP8 phones from sync'ing. See #3028 for details.
      o = [o activeSyncRepresentationInContext: context];

-      if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+      if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
        {
          [s appendFormat: @"<Body xmlns=\"Tasks:\">%@</Body>", o];
          [s appendString: @"<BodyTruncated xmlns=\"Tasks:\">0</BodyTruncated>"];
@@ -140,7 +140,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        {
          [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
          [s appendFormat: @"<Type>%d</Type>", 1];
-          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", (int)[o length]];
          [s appendFormat: @"<Data>%@</Data>", o];
          [s appendString: @"</Body>"];
        }
@@ -165,7 +165,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    [self setSummary: o];

  // FIXME: merge with iCalEvent
-  if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
+  if ([[context valueForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
    {
      if ((o = [theValues objectForKey: @"Body"]))
        [self setComment: o];
@@ -57,8 +57,6 @@ ProxyPreserveHost On
 #   Allow from your-cas-host-addr
 # </Proxy>

-ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
-
 # Enable to use Microsoft ActiveSync support
 # Note that you MUST have many sogod workers to use ActiveSync.
 # See the SOGo Installation and Configuration guide for more details.
@@ -67,11 +65,15 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 # http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync \
 # retry=60 connectiontimeout=5 timeout=360

+ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
+
 <Proxy http://127.0.0.1:20000/SOGo>
 ## adjust the following to your configuration
+## and do not forget to enable the headers module
+<IfModule headers_module>
  RequestHeader set "x-webobjects-server-port" "443"
-  RequestHeader set "x-webobjects-server-name" "yourhostname"
-  RequestHeader set "x-webobjects-server-url" "https://yourhostname"
+  RequestHeader set "x-webobjects-server-name" "%{HTTP_HOST}e" env=HTTP_HOST
+  RequestHeader set "x-webobjects-server-url" "https://%{HTTP_HOST}e" env=HTTP_HOST

 ## When using proxy-side autentication, you need to uncomment and
 ## adjust the following line:
@@ -79,6 +81,7 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 #  RequestHeader set "x-webobjects-remote-user" "%{REMOTE_USER}e" env=REMOTE_USER

  RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
+</IfModule>

  AddDefaultCharset UTF-8

@@ -90,5 +93,6 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 <IfModule rewrite_module>
  RewriteEngine On
  RewriteRule ^/.well-known/caldav/?$ /SOGo/dav [R=301]
+  RewriteRule ^/.well-known/carddav/?$ /SOGo/dav [R=301]
 </IfModule>

@@ -1,5 +1,7 @@
 Installation and Configuration Guide
 ====================================
+:toc: left
+:icons: font

 ////

@@ -54,7 +56,7 @@ at http://www.sogo.nu/
 Architecture and Compatibility
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-image::images/architecture.png[System Architecture]
+image::images/architecture.png[System Architecture, 400, 964]

 Standard protocols such as CalDAV, CardDAV, GroupDAV, HTTP, IMAP and
 SMTP are used to communicate with the SOGo platform or its
@@ -170,7 +172,7 @@ supported by SOGo:
 * Red Hat Enterprise Linux (RHEL) Server 5, 6 and 7
 * Community ENTerprise Operating System (CentOS) 5, 6 and 7
 * Debian GNU/Linux 6.0 (Squeeze) to 8.0 (Jessie)
-* Ubuntu 10.04 (Lucid) to 14.04 (Trusty)
+* Ubuntu 12.04 (Precise) to 14.04 (Trusty)

 Make sure the required components are started automatically at boot time
 and that they are running before proceeding with the SOGo configuration.
@@ -179,7 +181,7 @@ standard distribution. For example, if you are using Red Hat Enterprise
 Linux 5, you have to be subscribed to the Red Hat Network before
 continuing with the SOGo software installation.

-This document covers the installation of SOGo under RHEL 6.
+NOTE: This document covers the installation of SOGo under RHEL 6.

 For installation instructions on Debian and Ubuntu, please refer
 directly to the SOGo website at http://www.sogo.nu/.
@@ -214,12 +216,10 @@ gpgcheck=0
 Some of the softwares on which SOGo depends are available from the
 repository of RepoForge (previously known as RPMforge). To add RepoForge
 to your packages sources, download and install the appropriate RPM
-package
-from http://packages.sw.be/rpmforge-release/.
+package from http://packages.sw.be/rpmforge-release/.
 Also make sure you enabled the "rpmforge-extras" repository.

-For more information on using RepoForge,
-visit http://repoforge.org/use/.
+For more information on using RepoForge, visit http://repoforge.org/use/.

 Software Installation
 ~~~~~~~~~~~~~~~~~~~~~
@@ -294,7 +294,7 @@ associated to a domain is limited to access only the users data from the
 same domain. Consequently, the configuration parameters of SOGo are
 defined on three levels:

-image::images/preferences-hierarchy.png[Preferences Hierarchy]
+image::images/preferences-hierarchy.png[Preferences Hierarchy, 400, 400]

 Each level inherits the preferences of the parent level. Therefore,
 domain preferences define the defaults values of the user preferences,
@@ -368,6 +368,13 @@ Defaults to 10 (minutes).
 Do not set this too low as child processes replying to clients on a slow
 internet connection could be killed prematurely.

+|S |WOMaxUploadSize
+|Parameter used to set the maximum allowed size for content being
+sent to SOGo using a PUT or a POST call. This can also limit the file
+attachment size being uploaded to SOGo when composing a mail. The
+value is in kilobyte. By default, the value is 0, or disabled so no
+limit will be set.
+
 |S |SxVMemLimit
 |Parameter used to set the maximum amount of memory (in
 megabytes) that a child can use. Reaching that value will force children
@@ -714,6 +721,21 @@ Default value is `0`, or disabled.
 |Number of seconds, default to `300` (or 5 minutes). Note that
 _SOGoCacheCleanupInterval_ must be set to a value equal or higher than
 _SOGoFailedLoginBlockInterval_.
+
+|S |SOGoMaximumRequestCount
+|Parameter used to control the number of requests a user can send to the SOGo
+server in _SOGoMaximumRequestInterval_ seconds or more. If conditions are met
+or exceeded, the user will not be able to perform requests on the SOGo server
+for _SOGoRequestBlockInterval_ seconds and will receive 429 HTTP responses for
+any requests being made. Default value is 0, or disabled
+
+|S |SOGoMaximumRequestInterval
+|Number of seconds, defaults to `30`.
+
+|S |SOGoRequestBlockInterval
+|Number of seconds, defaults to 300 (or 5 minutes). Note that _SOGoCacheCleanupInterval_
+must be set to a value equal or higher than _SOGoRequestBlockInterval_.
+
 |=======================================================================

 Authentication using LDAP
@@ -885,7 +907,8 @@ table.

 |MailFieldNames
 |An array of fields that returns the user's email addresses (defaults to
-`mail` when unset).
+`mail` when unset). Note that SOGo will always automatically strip the
+protocol value from the attribute if the attribute name is `proxyAddresses`.

 |SearchFieldNames
 |An array of fields to to match against the search string when filtering
@@ -1035,8 +1058,8 @@ repository

 |ModulesConstraints (optional)
 |Limits the access of any module through a constraint based on an LDAP
-attribute; must be a dictionary with keys `Mail`, and/or `Calendar`, for
-example:
+attribute; must be a dictionary with keys `Mail`, and/or `Calendar`,
+and/or `ActiveSync` for example:

 ----
 ModulesConstraints = {
@@ -1125,7 +1148,7 @@ fax number, one could map it to the _facsimiletelephonenumber_ attribute
 like this:

 ----
-mapping = \{
+mapping = {
   facsimiletelephonenumber = ("fax", "facsimiletelephonenumber");
 };
 ----
@@ -1322,6 +1345,29 @@ supported, such as MySQL and Oracle.
 First, make sure that your PostgreSQL server has TCP/IP connections
 support enabled.

+[TIP]
+===============================
+SOGo stores the database hostname together with table references inside
+several database tables. To prevent possible future issues when moving
+the database to another host, it is best practice to add a local alias name to
+your `/etc/hosts` file, and using this in `/etc/sogo/sogo.conf` instead of the
+actual name of your server or localhost. When the database host name changes,
+you can now simply change the hosts file instead of updating several table
+columns replacing the old hostname. An example entry for `/etc/hosts` when
+running the database on the same host, registering `127.0.0.1` not only for
+`localhost`, but also the `db-alias` alias:
+
+ 127.0.0.1		localhost db-alias
+
+In the SOGo configuration, use the alias name instead of the real IP address or
+host name, for example
+
+----
+SOGoProfileURL =
+    "postgresql://sogo:sogo@db-alias:5432/sogo/sogo_user_profile";
+----
+===============================
+
 Create the database user and schema using the following commands:

 ----
@@ -1385,6 +1431,13 @@ URL could be set to something like:
 See the "EMail reminders" section in this document for more information.
 |=======================================================================

+
+[NOTE]
+Any non-URL safe characters in username/password must be URL-encoded.
+For example, if your SOGo database password is `so%go`, you must set
+the value in your preferences to `so%25go` - where `%` is encoded
+to `%25`.
+
 If you're using MySQL, make sure in your `my.cnf` file you have:

 ----
@@ -1628,6 +1681,16 @@ Defaults to `Trash` when unset.
 Use a `/`  as a hierarchy separator if referring to an IMAP subfolder.
 For example: `INBOX/Trash`.

+|U |SOGoJunkFolderName
+|Parameter used to set the IMAP folder name used to store junk
+messages.
+
+Defaults to `Junk` when unset.
+
+Use a `/`  as a hierarchy separator if referring to an IMAP subfolder.
+For example: `INBOX/Junk`. Also see the SOGoMailJunkSettings for
+more options regarding junk/not-junk actions.
+
 |D |SOGoIMAPCASServiceName
 |Parameter used to set the CAS service name (URL) of the imap service.
 This is useful if SOGo is connecting to the IMAP service through a
@@ -1830,6 +1893,11 @@ host.

 Defaults to `NO` when unset.

+|U |SOGoSieveFilters
+|Parameter used to define initial Sieve scripts for users. The user
+can still modify the scripts and the initial values will be written
+to the Sieve server upon first login.
+
 |D |SOGoMailPollingIntervals
 |Parameter used to define the mail polling intervals (in minutes)
 available to the user. The parameter is an array that can contain the
@@ -2082,7 +2150,21 @@ Defaults to `%{FolderName} (%{UserName} <%{Email}>)` when unset.
 the template named `UIxAdditionalPreferences.wox`. This template should
 be put under `~sogo/GNUstep/Library/SOGo/Templates/PreferencesUI/`.

-Defaults to `NO` when unset.
+|D |SOGoMailJunkSettings
+|Parameter used to enable email junk settings. The value is a dictionary
+and the follow keys are supported: `vendor` (which must be set to "generic"
+for now), `junkEmailAddress` which sets the email address to whom SOGo will
+send junk mails to, `notJunkEmailAddress` which sets the email address to
+whome SOGo will send non-junk mails to and `limit`, which is an integer value
+and sets the maximum number of mails that will be attached to a
+junk/not junk report sent by SOGo. Example: `SOGoMailJunkSettings = {
+vendor = "generic"; junkEmailAddress = "spam@foo.com";
+notJunkEmailAddress = "ham@foo.com"; limit = 10;
+};`
+
+|D |SOGoMailKeepDraftsAfterSend
+|Parameter used to keep mails in the drafts folder once they have been
+sent by SOGo. Defaults to `NO` when unset.
 |=======================================================================

 SOGo Configuration Summary
@@ -2111,6 +2193,7 @@ like this:
    SOGoDraftsFolderName = Drafts;
    SOGoSentFolderName = Sent;
    SOGoTrashFolderName = Trash;
+    SOGoJunkFolderName = Junk;
    SOGoMailingMechanism = smtp;
    SOGoSMTPServer = 127.0.0.1;
    SOGoUserSources = (
@@ -233,6 +233,7 @@ Installation
 This section will guide you through the installation of the native
 Microsoft Outlook compatibility layer SOGo offers.

+////
 Red Hat Enterprise Linux v6 x86_64
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -316,7 +317,7 @@ from this guide.
 On Ubuntu 12.04, the Samba init scripts need to be modified to
 disable the upstart check. For more details, refer to:
 https://wiki.samba.org/index.php/Samba4/InitScript
-
+////

 Debian 8 (Jessie) and Ubuntu 14.04 (Trusty Tahr)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -387,7 +388,7 @@ Run the following commands as root:

 ----
 samba-tool domain provision --realm=example.com \
-          --domain=OPENCHANGE \
+          --domain=EXAMPLE \
          --adminpass='%1OpenChange' \
          --server-role='domain controller'

@@ -395,7 +396,7 @@ samba-tool user setexpiry administrator --noexpiry
 ----

 You might consider changing the realm and domain used, to suit your
-enviroment.
+environment.

 You might also have to
 remove `/etc/samba/smb.conf` prior running this command.
@@ -441,7 +442,7 @@ Your Samba 4 configuration file should look like this:
 OpenChange Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~

-OpenChange 2.2 stores its metadata in MySQL so you need to have it installed.
+Since v2.2, OpenChange stores its metadata in MySQL so you need to have it installed.

 First, create the OpenChange MySQL user:

@@ -512,9 +513,11 @@ mapistore:indexing_backend = mysql://openchange-user:openchange$123@localhost/op
 mapiproxy:openchangedb = mysql://openchange-user:openchange$123@localhost/openchange
 ----

+////
 On RHEL, make sure SELinux is disabled:

 setenforce 0
+////

 Next, you can start Samba using the usual command:

@@ -545,9 +548,11 @@ This service runs as a WSGI application under apache (mod_wsgi).
 While HTTPS is not required to access this service, it is strongly
 recommended.

+////
 On RHEL-based distributions, the apache configuration required by these
 services can be found in `/etc/httpd/conf.d/ocsmanager.conf` and
 `/etc/httpd/conf.d/rpcproxy.conf`.
+////

 For Debian-based distributions, these files can be found
 in `/etc/apache2/conf.d/` or `/etc/apache2/conf-available`.
@@ -563,8 +568,10 @@ The OCS Manager and RPC Proxy configuration module can be enabled using:
 a2enconf ocsmanager
 a2enconf rpcproxy

+////
 On RHEL-based distributions, make sure the `LoadModule` directive is
 uncommented in `/etc/httpd/conf.d/wsgi.conf`.
+////

 The _reqtimeout_ apache module is known to cause problems when using the
 default configuration shipped with Debian-based systems. On such
@@ -580,10 +587,12 @@ To avoid this problem, use a much higher timeout or disable the module:
 a2dismod reqtimeout

 You should now restart the Apache service and make sure it will start on
-boot. On RHEL-based distributions, do:
+boot.
+////
+On RHEL-based distributions, do:

 chkconfig httpd on && /etc/init.d/httpd restart
-
+////
 On Debian-based distributions, do:

 update-rc.d apache2 defaults && /etc/init.d/apache2 restart
@@ -809,11 +818,10 @@ can be ignored for now. This feature is currently not supported.
 remove any data associated with the user from the SOGo server and
 recreate a Microsoft Outlook profile.
 To remove any data associated to a user, use
-the `openchange_user_cleanup` script distributed with SOGo. The script
-can be found in `/usr/share/doc/sogo/` (`/usr/share/sogo-VERSION/` on
-RHEL).
+the `openchange_user_cleanup` script distributed with OpenChange. The script
+can be found in `/usr/share/openchange/`.
 To reset a user, run the script as root:
-`python openchange_user_cleanup username`. See the usage output for additional options.
+`openchange_user_cleanup username`. See the usage output for additional options.
 * The "Out of Office Assistant" will not currently work. This feature
 has not been implemented.
 * Creating folders below INBOX (when not normally permitted by the IMAP
@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 2.3.0 - June 2015</releaseinfo>
-<subtitle>for version 2.3.0</subtitle>
-<date>2015-06-01</date>
+<releaseinfo>Version 2.3.16 - September 2016</releaseinfo>
+<subtitle>for version 2.3.16</subtitle>
+<date>2016-09-28</date>

 <legalnotice>
  <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>
@@ -6,13 +6,13 @@
    Authors:
      - Inverse inc. <info@inverse.ca>

-    Copyright (C) 2008-2015 Inverse inc.
+    Copyright (C) 2008-2016 Inverse inc.
    License: GFDL 1.2 or later. http://www.gnu.org/licenses/fdl.html

 ////

 // TODO have the build system take care of this

-:release_version: 2.3.0
+:release_version: 2.3.16

 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
@@ -42,6 +42,7 @@
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserFolder.h>
+#import <SOGo/SOGoUserManager.h>

 #import "SOGo+DAV.h"

@@ -267,7 +268,7 @@
  NSObject <DOMNodeList> *list;
  NSObject <DOMNode> *valueNode;
  NSArray *elements;
-  NSString *property, *match;
+  NSString *property=nil, *match=nil;

  list = [searchElement getElementsByTagName: @"prop"];
  if ([list length])
@@ -365,31 +366,26 @@
    withEmailAddressSetMatching: (NSString *) value
                      inContext: (WOContext *) localContext
 {
-  id <SOGoSource> authenticationSource;
-  SOGoUser *activeUser;
+  SOGoUserManager *um;
  NSArray *records;
  NSUInteger count, max;
  NSString *uid;
  SOGoUserFolder *collection;

-  activeUser = [localContext activeUser];
-  if ([activeUser respondsToSelector: @selector (authenticationSource)])
+  um = [SOGoUserManager sharedUserManager];
+  records = [um fetchUsersMatching: value
+			  inDomain: [[localContext activeUser] domain]];
+
+  max = [records count];
+  for (count = 0; count < max; count++)
    {
-      authenticationSource = [[localContext activeUser] authenticationSource];
-      records = [authenticationSource
-                  fetchContactsMatching: value
-                               inDomain: [activeUser domain]];
-      max = [records count];
-      for (count = 0; count < max; count++)
-        {
-          uid = [[records objectAtIndex: count] objectForKey: @"c_uid"];
-          if ([uid length] > 0)
-            {
-              collection = [[SOGoUser userWithLogin: uid]
+      uid = [[records objectAtIndex: count] objectForKey: @"c_uid"];
+      if ([uid length] > 0)
+	{
+	  collection = [[SOGoUser userWithLogin: uid]
                             homeFolderInContext: localContext];
-              [collections addObject: collection];
-            }
-        }
+	  [collections addObject: collection];
+	}
    }
 }

@@ -585,7 +581,6 @@
                             @"addressbook", @"calendar-access",
                             @"calendar-schedule", @"calendar-auto-schedule",
                             @"calendar-proxy",
-
                             @"calendar-query-extended",
                             @"extended-mkcol",
                             @"calendarserver-principal-property-search",
@@ -145,7 +145,7 @@ static BOOL debugLeaks;
  [$(@"SOGoFolder") soClass];

  /* load products */
-  [[SOGoProductLoader productLoader] loadAllProducts];
+  [[SOGoProductLoader productLoader] loadAllProducts: YES];
 }

 - (id) init
@@ -425,8 +425,12 @@ static BOOL debugLeaks;
 {
  static NSArray *runLoopModes = nil;
  static BOOL debugOn = NO;
+
+  SOGoSystemDefaults *sd;
  WOResponse *resp;
  NSDate *startDate;
+  NSString *path;
+
  NSTimeInterval timeDelta;

  if (debugRequests)
@@ -436,6 +440,7 @@ static BOOL debugLeaks;
      startDate = [NSDate date];
    }

+  sd = [SOGoSystemDefaults sharedSystemDefaults];
  cache = [SOGoCache sharedCache];
 #ifdef GNUSTEP_BASE_LIBRARY
  if (debugLeaks)
@@ -450,6 +455,64 @@ static BOOL debugLeaks;
    }
 #endif

+  // We check for rate-limiting settings - ignore anything actually
+  // sent to /SOGo/ (so unauthenticated requests).
+  path = [_request requestHandlerPath];
+  if ([path length] && [sd maximumRequestCount] > 0)
+    {
+      NSDictionary *requestCount;
+      NSString *username;
+      NSRange r;
+
+      r = [path rangeOfString: @"/"];
+
+      // We handle /sogo1/Calendar/.../ and "sogo1" as paths
+      if (r.length)
+        username = [path substringWithRange: NSMakeRange(0, r.location)];
+      else
+        username = path;
+
+      requestCount = [cache requestCountForLogin: username];
+
+      if (requestCount)
+        {
+          unsigned int  current_time, start_time, delta, block_time, request_count;
+
+          current_time = [[NSCalendarDate date] timeIntervalSince1970];
+          start_time = [[requestCount objectForKey: @"InitialDate"] unsignedIntValue];
+          delta = current_time - start_time;
+
+          block_time = [sd requestBlockInterval];
+          request_count = [[requestCount objectForKey: @"RequestCount"] intValue];
+
+          if ( request_count >= [sd maximumRequestCount] &&
+               delta < [sd maximumRequestInterval] &&
+               delta <= block_time )
+            {
+              resp = [WOResponse responseWithRequest: _request];
+              [resp setStatus: 429];
+              return resp;
+            }
+
+          if (delta > block_time)
+            {
+              [cache setRequestCount: 1
+                            forLogin: username
+                            interval: current_time];
+            }
+          else
+            [cache setRequestCount: (request_count+1)
+                          forLogin: username
+                          interval: start_time];
+        }
+      else
+        {
+          [cache setRequestCount: 1
+                        forLogin: username
+                        interval: 0];
+        }
+    }
+
  resp = [super dispatchRequest: _request];
  [cache killCache];

@@ -1,10 +1,322 @@
-2.3.1 (2015-06-XX)
+2.3.16 (2016-09-28)
+-------------------
+
+New features
+ - [eas] initial support for server-side mailbox search operations
+
+Enhancements
+ - [eas] propagate message submission errors to EAS clients (#3774)
+ - [web] updated CKEditor to version 4.5.11
+ - [web] added Serbian (sr) translation - thanks to Bogdanović Bojan
+
+Bug fixes
+ - [web] correctly set percent-complete for tasks from the list view (#3197)
+ - [core] fixed caching expiration of ACLs assigned to LDAP groups (#2867)
+ - [core] we now search in all domain sources for Apple Calendar
+ - [core] properly handle groups in Apple Calendar's delegation
+ - [core] make sure new cards always have a UID (#3819)
+
+2.3.15 (2016-09-14)
+------------------
+
+Enhancements
+ - [web] don't allow a recurrence rule to end before the first occurrence
+
+Bug fixes
+ - [eas] properly generate the BusyStatus for normal events
+ - [eas] properly escape all email and address fields
+ - [eas] properly generate yearly rrule
+ - [core] strip protocol value from proxyAddresses attribute (#3182)
+ - [web] handle binary content transfer encoding when displaying mails
+
+2.3.14 (2016-08-17)
+-------------------
+
+New features
+ - [eas] added folder merging capabilities
+
+Enhancements
+ - [web] expunge drafts mailbox when a draft is sent and deleted
+ - [web] style cancelled events in Calendar module (#2800)
+ - [web] updated CKEditor to version 4.5.10
+
+Bug fixes
+ - [eas] fixed long GUID issue preventing sometimes synchronisation (#3460)
+ - [web] improved extraction of HTML signature in Preferences module
+ - [web] really delete mailboxes being deleted from the Trash folder (#595, #1189, #641)
+ - [core] fixing sogo-tool backup with multi-domain configuration but domain-less logins
+ - [core] during event scheduling, use 409 instead of 403 so Lightning doesn't fail silently
+ - [core] correctly calculate recurrence exceptions when not overlapping the recurrence id
+ - [core] prevent invalid SENT-BY handling during event invitations (#3759)
+
+2.3.13 (2016-07-06)
+-------------------
+
+New features
+ - [core] now possible to set default Sieve script (#2949)
+ - [core] new sogo-tool truncate-calendar feature (#1513, #3141)
+ - [eas] initial Out-of-Office support in EAS
+
+Enhancements
+ - [core] avoid showing bundle loading info when not needed (#3726)
+ - [core] when restoring data using sogo-tool, regenerate Sieve script (#3029)
+ - [eas] use the preferred email identity in EAS if valid (#3698)
+ - [eas] handle inline attachments during EAS content generation
+ - [web] update jQuery File Upload library to 9.12.5
+
+Bug fixes
+ - [web] fixed crash when an attachment filename has no extension
+ - [web] dragging a toolbar button was blocking the mail editor in Firefox
+ - [eas] handle base64 EAS protocol version
+
+2.3.12 (2016-06-10)
+-------------------
+
+Enhancements
+ - [web] updated CKEditor to version 4.5.9
+ - [web] CKEditor: switched to the minimalist skin
+ - [web] CKEditor: added the base64image plugin
+ - [web] CKEditor: added the pastefromword plugin (#2295, #3313)
+ - [web] added Turkish (Turkey) (tr_TR) translation - thanks to Sinan Kurşunoğlu
+
+Bug fixes
+ - [core] sanity checks for events with bogus timezone offsets
+ - [core] strip X- tags when securing content (#3695)
+ - [core] properly handle flattened timezone definitions (#2690)
+ - [eas] when using EAS/ItemOperations, use IMAP PEEK operation
+ - [web] fixed recipients when replying from a message in the Sent mailbox (#2625)
+ - [web] fixed localizable strings in Card viewer
+ - [web] properly encode HTML attributes in Contacts module to avoid XSS issues
+ - [web] handle c_mail field format of quick record of contacts of v3 (#3443)
+ - [web] fixed all-day events covering a timezone change (#3457)
+ - [web] fixed display of invitation with a category (#3590)
+
+2.3.11 (2016-05-12)
+-------------------
+
+Bug fixes
+ - properly escape organizer name when using EAS (#3615)
+ - properly escape wide characters (#3616)
+ - calendars list when creating a new component in a calendar in which the user
+   can't delete components
+ - avoid double-appending domains in cache for multi-domain configurations (#3614)
+ - encode CR in EAS payload (#3626)
+ - password change during login process when using ppolicy
+ - correctly set answered/forwarded flags during EAS smart operations
+ - don't mark calendar invitations as read when fetching messages using EAS
+ - fixed messages archiving as zip file
+ - fixed multi-domain issue with non-unique ID across domains (#3625)
+ - fixed bogus headers generation when stripping folded bcc header (#3664)
+ - fixed issue with multi-value org units (#3630)
+ - fixed sensitive range of checkboxes in appointment editor (#3665)
+
+2.3.10 (2016-04-05)
+-------------------
+
+New features
+ - new user-based rate-limiting support for all SOGo requests (#3188)
+
+Bug fixes
+ - respect the LDAP attributes mapping in the list view
+ - handle empty body data when forwarding mails (#3581)
+ - correctly set EAS message class for S/MIME messages (#3576)
+ - we now handle the default classifications for tasks (#3541)
+ - handle FilterType changes using EAS (#3543)
+ - handle Dovecot's mail_shared_explicit_inbox parameter when using EAS
+ - prevent concurrent Sync ops from same EAS device (#3603)
+ - handle EAS loop termination when SOGo is being shutdown (#3604)
+ - avoid marking mails as read when archiving a folder (#2792)
+ - now cache heartbeat interval and folders list during EAS Ping ops (#3606)
+ - sanitize non-us-ascii 7bit emails when using EAS (#3592)
+
+2.3.9 (2016-03-16)
+------------------
+
+New features
+ - you can now limit the file upload size using the WOMaxUploadSize
+   configuration parameter (integer value in kilobytes) (#3510, #3135)
+
+Enhancements
+ - allow resources to prevent invitations (#3410)
+ - now support EAS MIME truncation
+ - added Lithuanan (lt) translation - thanks to Mantas Liobė
+
+Bug fixes
+ - allow EAS attachments get on 2nd-level mailboxes (#3505)
+ - fixed EAS bday shift (#3518)
+ - prefer SOGoRefreshViewCheck to SOGoMailMessageCheck (#3465)
+ - properly unfold long mail headers (#3152)
+
+2.3.8 (2016-02-05)
+------------------
+
+Enhancements
+ - updated CKEditor to version 4.5.7
+
+Bug fixes
+ - correctly encode filename of attachments over EAS (#3491)
+ - correctly encode square brackets for IMAP folder names (#3321)
+ - add shared/public namespaces in the list or returned folders
+
+2.3.7 (2016-01-25)
+------------------
+
+New features
+ - new junk/not junk capability with generic SMTP integration
+
+Enhancements
+ - newly created folders using EAS are always sync'ed by default (#3454)
+ - added Croatian (hr_HR) translation - thanks to Jens Riecken
+
+Bug fixes
+ - now always generate invitation updates when using EAS
+ - rewrote the string sanitization to be 32-bit Unicode safe
+ - do not try to decode non-wbxml responses for debug output (#3444)
+
+2.3.6 (2016-01-18)
+------------------
+
+New features
+ - now able to sync only default mail folders when using EAS
+
+Enhancements
+ - unit testing for RTFHandler
+ - JUnit output for sogo-tests
+
+Bug fixes
+ - don't unescape twice mail folder names (#3423)
+ - don't consider mobile Outlook EAS clients as DAV ones (#3431)
+ - we now follow 301 redirects when fetching ICS calendars
+ - when deleting an event using EAS, properly invoke the auto-scheduling code
+ - do not include failure attachments (really long filenames)
+ - fix encoding of email subjects with non-ASCII characters
+ - fix appointment notification mails using SOGoEnableDomainBasedUID configuration
+ - fix shifts in event times on Outlook
+
+2.3.5 (2016-01-05)
+------------------
+
+Enhancements
+ - return an error to openchange if mail message delivery fails
+ - return the requested elements on complex requests from Outlook when downloading changes
+ - user sources can be loaded dynamically
+ - unify user sources API
+ - updated Russian translation (#3383)
+
+Bug fixes
+ - properly compute the last week number for the year (#1010)
+ - share calendar, tasks and contacts folders in Outlook 2013 with editor permissions
+ - priorize filename in Content-Disposition against name in Content-Type to get the filename of an attachment in mail
+ - request all contacts when there is no filter in Contacts menu in Webmail
+ - personal contacts working properly on Outlook
+ - fixes on RTF parsing used by event/contact description and mail as RTF to read non-ASCII characters:
+   better parsing of font table, when using a font, switch to its character set, correct parsing of
+   escaped characters and Unicode character command word support for unicode characters greater than 32767
+ - no crash resolving recipients after reconnecting LDAP connection
+ - avoid creation of phantom contacts in SOGo from distribution list synced from Outlook.
+ - accepted & updated event names are now shown correctly in Outlook
+ - provide safe guards in mail and calendar to avoid exceptions while syncing
+
+2.3.4 (2015-12-15)
+------------------
+
+New features
+ - initial support for EAS calendar exceptions
+
+Enhancements
+ - limit the maximum width of toolbar buttons (#3381)
+ - updated CKEditor to version 4.5.6
+
+Bug fixes
+ - JavaScript exception when printing events from calendars with no assigned color (#3203)
+ - EAS fix for wrong charset being used (#3392)
+ - EAS fix on qp-encoded subjects (#3390)
+ - correctly handle all-day event exceptions when the master event changes
+ - prevent characters in calendar component UID causing issues during import process
+ - avoid duplicating attendees when accepting event using a different identity over CalDAV
+
+2.3.3a (2015-11-18)
+-------------------
+
+Bug fixes
+ - expanded mail folders list is not saved (#3386)
+ - cleanup translations
+
+2.3.3 (2015-11-11)
+------------------
+
+New features
+ - initial S/MIME support for EAS (#3327)
+ - now possible to choose which folders to sync over EAS
+
+Enhancements
+ - we no longer always entirely rewrite messages for Outlook 2013 when using EAS
+ - support for ghosted elements on contacts over EAS
+ - added Macedonian (mk_MK) translation - thanks to Miroslav Jovanovic
+ - added Portuguese (pt) translation - thanks to Eduardo Crispim
+
+Bug fixes
+ - numerous EAS fixes when connections are dropped before the EAS client receives the response (#3058, #2849)
+ - correctly handle the References header over EAS (#3365)
+ - make sure English is always used when generating Date headers using EAS (#3356)
+ - don't escape quoted strings during versit generation
+ - we now return all cards when we receive an empty addressbook-query REPORT
+ - avoid crash when replying to a mail with no recipients (#3359)
+ - inline images sent from SOGo webmail are not displayed in Mozilla Thunderbird (#3271)
+ - prevent postal address showing on single line over EAS (#2614)
+ - display missing events when printing working hours only
+ - fix corner case making server crash when syncing hard deleted messages when clear offline items was set up (Zentyal)
+ - avoid infinite Outlook client loops trying to set read flag when it is already set (Zentyal)
+ - avoid crashing when calendar metadata is missing in the cache (Zentyal)
+ - fix recurrence pattern event corner case created by Mozilla Thunderbird which made server crash (Zentyal)
+ - fix corner case that removes attachments on sending messages from Outlook (Zentyal)
+ - freebusy on web interface works again in multidomain environments (Zentyal)
+ - fix double creation of folders in Outlook when the folder name starts with a digit (Zentyal)
+ - avoid crashing Outlook after setting a custom view in a calendar folder (Zentyal)
+ - handle emails having an attachment as their content
+ - fixed JavaScript syntax error in attendees editor
+ - fixed wrong comparison of meta vs. META tag in HTML mails
+ - fixed popup menu position when moved to the left (#3381)
+ - fixed dialog position when at the bottom of the window (#2646, #3378)
+
+2.3.2 (2015-09-16)
+------------------
+
+Enhancements
+ - improved EAS speed and memory usage, avoiding many IMAP LIST commands (#3294)
+ - improved EAS speed during initial syncing of large mailboxes (#3293)
+ - updated CKEditor to version 4.5.3
+
+Bug fixes
+ - fixed display of whitelisted attendees in Preferences window on Firefox (#3285)
+ - non-latin subfolder names are displayed correctly on Outlook (Zentyal)
+ - fixed several sync issues on environments with multiple users (Zentyal)
+ - folders from other users will no longer appear on your Outlook (Zentyal)
+ - use right auth in multidomain environments in contacts and calendar from Outlook (Zentyal)
+ - session fix when SOGoEnableDomainBasedUID is enabled but logins are domain-less
+ - less sync issues when setting read flag (Zentyal)
+ - attachments with non-latin filenames sent by Outlook are now received (Zentyal)
+ - support attachments from more mail clients (Zentyal)
+ - avoid conflicting message on saving a draft mail (Zentyal)
+ - less conflicting messages in Outlook while moving messages between folders (Zentyal)
+ - start/end shifting by 1 hour due to timezone change on last Sunday of October 2015 (#3344)
+ - fixed localization of calendar categories with empty profile (#3295)
+ - fixed options availability in contextual menu of Contacts module (#3342)
+
+2.3.1 (2015-07-23)
 ------------------

 Enhancements
 - improved EAS speed, especially when fetching big attachments
 - now always enforce the organizer's default identity in appointments
 - improved the handling of default calendar categories/colors (#3200) 
+ - added support for DeletesAsMoves over EAS
+ - added create-folder subcommand to sogo-tool to create contact and calendar folders
+ - group mail addresses can be used as recipient in Outlook
+ - added 'ActiveSync' module constraints
+ - updated CKEditor to version 4.5.1
+ - added Slovenian translation - thanks to Jens Riecken
+ - added Chinese (Taiwan) translation

 Bug fixes
 - EAS's GetItemEstimate/ItemOperations now support fetching mails and empty folders
@@ -14,6 +326,14 @@ Bug fixes
 - properly support big characters in EAS and fix encoding QP EAS error for Outlook (#3082)
 - properly encode id of DOM elements in Address Book module (#3239, #3245)
 - fixed multi-domain support for sogo-tool backup/restore (#2600)
+ - fixed data ordering in events list of Calendar module (#3261)
+ - fixed data ordering in tasks list of Calendar module (#3267)
+ - Android EAS Lollipop fixes (#3268 and #3269) 
+ - improved EAS email flagging handling (#3140)
+ - fixed computation of GlobalObjectId (#3235)
+ - fixed EAS conversation ID issues on BB10 (#3152)
+ - fixed CR/LF printing in event's description (#3228)
+ - optimized Calendar module in multidomain configurations

 2.3.0 (2015-06-01)
 -------------------
@@ -78,6 +78,9 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreGCSMessage.m \
 	MAPIStoreGCSMessageTable.m \
 	\
+	MAPIStoreCalTaskFolder.m \
+	MAPIStoreCalTaskMessage.m \
+	\
 	MAPIStoreCalendarAttachment.m \
 	MAPIStoreCalendarContext.m \
 	MAPIStoreCalendarFolder.m \
@@ -145,7 +148,8 @@ $(DBMSGREADER_TOOL)_LIB_DIRS += \
 	-L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \
 	-L../SOPE/GDLContentStore/obj/ -lGDLContentStore \
 	-L../SOPE/NGCards/obj/ -lNGCards \
-	-lNGObjWeb
+	-lNGObjWeb \
+	$(LIBMAPI_LIBS)

 TEST_TOOL_NAME += $(PLREADER_TOOL) $(DBMSGREADER_TOOL)

@@ -33,8 +33,9 @@
 }

 - (id) authenticatorInContext: (id) context;
-
+- (MAPIStoreUserContext *) userContext;
 - (void) setUserContext: (MAPIStoreUserContext *) newContext;
+- (void) cleanup;

@end

@@ -76,6 +76,11 @@ MAPIApplication *MAPIApp = nil;
  return NO;
 }

+- (MAPIStoreUserContext *) userContext
+{
+    return userContext;
+}
+
 - (void) setUserContext: (MAPIStoreUserContext *) newContext
 {
  /* user contexts must not be retained here ad their holder (mapistore)
@@ -88,4 +93,9 @@ MAPIApplication *MAPIApp = nil;
  return [userContext authenticator];
 }

+- (void) cleanup
+{
+  [userContext deactivate];
+}
+
@end
@@ -24,6 +24,7 @@
 #define MAPISTORECALENDARWRAPPER_H

 #import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTimeZone.h>
 #import <Appointments/iCalEntityObject+SOGo.h>

 #import "MAPIStoreObjectProxy.h"
@@ -42,7 +43,7 @@
  iCalCalendar *calendar;
  iCalEvent *firstEvent;
  iCalEvent *event;
-  NSTimeZone *timeZone;
+  iCalTimeZone *timeZone;
  SOGoUser *user;
  NSString *senderEmail;
  NSData *globalObjectId;
@@ -57,117 +58,119 @@
 + (id) wrapperWithICalEvent: (iCalEvent *) newEvent
                    andUser: (SOGoUser *) newUser
             andSenderEmail: (NSString *) newSenderEmail
-                 inTimeZone: (NSTimeZone *) newTimeZone
         withConnectionInfo: (struct mapistore_connection_info *) newConnInfo;
 - (id) initWithICalEvent: (iCalEvent *) newEvent
                 andUser: (SOGoUser *) newUser
          andSenderEmail: (NSString *) newSenderEmail
-              inTimeZone: (NSTimeZone *) newTimeZone
      withConnectionInfo: (struct mapistore_connection_info *) newConnInfo;

 /* getters */
 - (void) fillMessageData: (struct mapistore_message *) dataPtr
                inMemCtx: (TALLOC_CTX *) memCtx;

- (int) getPidTagSenderEmailAddress: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagSenderAddressType: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagSenderName: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagSenderEntryId: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx;
+- (NSString *) creator;
+- (NSString *) owner;
+- (NSUInteger) sensitivity;

- (int) getPidTagReceivedByAddressType: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagReceivedByEmailAddress: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagReceivedByName: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagReceivedByEntryId: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSenderEmailAddress: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSenderAddressType: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSenderName: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSenderEntryId: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx;

- (int) getPidTagIconIndex: (void **) data
-              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagOwnerAppointmentId: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidMeetingType: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagMessageClass: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagStartDate: (void **) data
-              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidAppointmentSequence: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidAppointmentStateFlags: (void **) data
+- (enum mapistore_error) getPidTagReceivedByAddressType: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagReceivedByEmailAddress: (void **) data
+                                                inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagReceivedByName: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagReceivedByEntryId: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx;
+
+- (enum mapistore_error) getPidTagIconIndex: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagOwnerAppointmentId: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidMeetingType: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagMessageClass: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagStartDate: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidAppointmentSequence: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidAppointmentStateFlags: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidResponseStatus: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx;
+
+- (enum mapistore_error) getPidLidAppointmentStartWhole: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidCommonStart: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagEndDate: (void **) data
+                                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidAppointmentEndWhole: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidCommonEnd: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidAppointmentDuration: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidAppointmentSubType: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidBusyStatus: (void **) data // TODO
+                                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidIndentedBusyStatus: (void **) data // TODO
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagNormalizedSubject: (void **) data // SUMMARY
+                                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidLocation: (void **) data // LOCATION
+                                  inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidPrivate: (void **) data // private (bool), should depend on CLASS and permissions
+                                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSensitivity: (void **) data // not implemented, depends on CLASS
+                                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagImportance: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagBody: (void **) data
                              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidResponseStatus: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx;
-
- (int) getPidLidAppointmentStartWhole: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidCommonStart: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagEndDate: (void **) data
-            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidAppointmentEndWhole: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidCommonEnd: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidAppointmentDuration: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidAppointmentSubType: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidBusyStatus: (void **) data // TODO
-                   inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidIndentedBusyStatus: (void **) data // TODO
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagNormalizedSubject: (void **) data // SUMMARY
-                          inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidLocation: (void **) data // LOCATION
-                 inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidPrivate: (void **) data // private (bool), should depend on CLASS and permissions
-                inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagSensitivity: (void **) data // not implemented, depends on CLASS
-                inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagImportance: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagBody: (void **) data
-         inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidIsRecurring: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidRecurring: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidAppointmentRecur: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidGlobalObjectId: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidCleanGlobalObjectId: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidServerProcessed: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidServerProcessingActions: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidAppointmentReplyTime: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidIsRecurring: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidRecurring: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidAppointmentRecur: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidGlobalObjectId: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidCleanGlobalObjectId: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidServerProcessed: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidServerProcessingActions: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidAppointmentReplyTime: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx;

 /* reminders */
- (int) getPidLidReminderSet: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidReminderDelta: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidReminderTime: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidReminderSignalTime: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidReminderOverride: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidReminderType: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidReminderPlaySound: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidReminderFileParameter: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderSet: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderDelta: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderTime: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderSignalTime: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderOverride: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderType: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderPlaySound: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidReminderFileParameter: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;

@end

@@ -36,13 +36,13 @@
 - (void) setAID: (uint32_t) newAID;
 - (uint32_t) AID;

- (int) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-                    withMID: (uint64_t *) mid
-           withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                   inMemCtx: (TALLOC_CTX *) memCtx;
- (int) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-             withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+                                     withMID: (uint64_t *) mid
+                            withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+                              withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                                      inMemCtx: (TALLOC_CTX *) memCtx;

 /* helpers */
 - (NSData *) mimeAttachTag;
@@ -67,40 +67,40 @@
  return mimeAttachTag;
 }

- (int) getPidTagMid: (void **) data
-            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMid: (void **) data
+                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongLongValue (memCtx, [container objectId]);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachNumber: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachNumber: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, aid);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagRenderingPosition: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagRenderingPosition: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0xffffffff);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAccessLevel: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAccessLevel: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-                    withMID: (uint64_t *) mid
-           withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) openEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+                                     withMID: (uint64_t *) mid
+                            withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStoreEmbeddedMessage *attMessage;
  struct mapistore_message *mapistoreMsg;
@@ -118,9 +118,9 @@
  return (attMessage ? MAPISTORE_SUCCESS : MAPISTORE_ERROR);
 }

- (int) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
-             withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+                              withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStoreEmbeddedMessage *attMessage;
  struct mapistore_message *mapistoreMsg;
@@ -46,6 +46,9 @@
                              forURL: (NSURL *) server
                          forceRenew: (BOOL) renew;

+- (NSString *) passwordInContext: (WOContext *) context;
+
+
@end

 #endif /* MAPISTOREAUTHENTICATOR_H */
@@ -72,4 +72,8 @@
        return imapPassword;
 }

+- (NSString *) passwordInContext: (WOContext *) context
+{
+	return password;
+}
@end
@@ -0,0 +1,35 @@
+/* MAPIStoreCalTaskFolder.h - this file is part of SOGo
+ *
+ * Copyright (C) 2016 Enrique J. Hernandez
+ *
+ * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef MAPISTORECALTASKFOLDER_H
+#define MAPISTORECALTASKFOLDER_H
+
+#import "MAPIStoreGCSFolder.h"
+
+/* This class is intended to share code between Calendar and Tasks as
+   of nowadays share the table */
+
+@interface MAPIStoreCalTaskFolder : MAPIStoreGCSFolder
+
+@end
+
+#endif /* MAPISTORECALTASKFOLDER_H */
@@ -0,0 +1,101 @@
+/* MAPIStoreCalTaskFolder.m - this file is part of SOGo
+ *
+ * Copyright (C) 2016 Enrique J. Hernandez
+ *
+ * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSString.h>
+
+#import <SOGo/SOGoPermissions.h>
+
+#import "MAPIStoreCalTaskFolder.h"
+
+@implementation MAPIStoreCalTaskFolder
+
+- (NSArray *) expandRoles: (NSArray *) roles
+{
+  static NSDictionary *rolesMap = nil;
+  NSArray *subRoles;
+  NSMutableSet *expandedRoles;
+  NSString *role, *subRole;
+  NSUInteger i, max, j;
+
+  if (!rolesMap)
+    {
+      /* Build the map of array permissions */
+      rolesMap = [[NSDictionary alloc] initWithObjects: [NSArray arrayWithObjects:
+                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_PublicDAndTViewer,
+                                                                                              SOGoCalendarRole_PublicViewer,
+                                                                                              SOGoCalendarRole_PublicResponder,
+                                                                                              SOGoCalendarRole_PublicModifier, nil],
+                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_ConfidentialDAndTViewer,
+                                                                                              SOGoCalendarRole_ConfidentialViewer,
+                                                                                              SOGoCalendarRole_ConfidentialResponder,
+                                                                                              SOGoCalendarRole_ConfidentialModifier, nil],
+                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_PrivateDAndTViewer,
+                                                                                              SOGoCalendarRole_PrivateViewer,
+                                                                                              SOGoCalendarRole_PrivateResponder,
+                                                                                              SOGoCalendarRole_PrivateModifier, nil],
+                                                                   [NSArray arrayWithObjects: SOGoCalendarRole_ComponentDAndTViewer,
+                                                                                              SOGoCalendarRole_ComponentViewer,
+                                                                                              SOGoCalendarRole_ComponentResponder,
+                                                                                              SOGoCalendarRole_ComponentModifier, nil],
+                                                                   nil]
+                                               forKeys: [NSArray arrayWithObjects: @"Public", @"Confidential", @"Private",
+                                                                                   @"Component", nil]];
+    }
+
+  max = [roles count];
+  expandedRoles = [NSMutableSet set];
+  for (i = 0; i < max; i++)
+    {
+      role = [roles objectAtIndex: i];
+      subRoles = nil;
+      if ([role hasPrefix: @"Public"])
+          subRoles = [rolesMap objectForKey: @"Public"];
+      else if ([role hasPrefix: @"Confidential"])
+          subRoles = [rolesMap objectForKey: @"Confidential"];
+      else if ([role hasPrefix: @"Private"])
+          subRoles = [rolesMap objectForKey: @"Private"];
+      else if ([role hasPrefix: @"Component"])
+          subRoles = [rolesMap objectForKey: @"Component"];
+
+      if (subRoles)
+        {
+          for (j = 0; j < [subRoles count]; j++)
+            {
+              subRole = [subRoles objectAtIndex: j];
+              [expandedRoles addObject: subRole];
+
+              if ([subRole isEqualToString: role])
+                break;
+            }
+        }
+      else
+        {
+          [expandedRoles addObject: role];
+        }
+    }
+
+  return [expandedRoles allObjects];
+}
+
+@end
@@ -0,0 +1,40 @@
+/* MAPIStoreCalTaskMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2016 Enrique J. Hernandez
+ *
+ * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef MAPISTORECALTASKMESSAGE_H
+#define MAPISTORECALTASKMESSAGE_H
+
+#import "MAPIStoreGCSMessage.h"
+
+/* This class is intended to share common logic for Calendar and Tasks
+   as of today they are stored in the same table. This is relevant for
+   permissions */
+@interface MAPIStoreCalTaskMessage : MAPIStoreGCSMessage
+{
+}
+
+/* Get the sensitivity (access class) from a message */
+- (NSUInteger) sensitivity;
+
+@end
+
+#endif /* MAPISTORECALTASKMESSAGE_H */
@@ -0,0 +1,107 @@
+/* MAPIStoreCalTaskMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2016 Enrique J. Hernandez
+ *
+ * Author: Enrique J. Hernandez <ejhernandez@zentyal.com>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <SOGo/SOGoPermissions.h>
+
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreCalTaskMessage.h"
+
+@implementation MAPIStoreCalTaskMessage
+
+/* It must be implemented by subclasses */
+- (NSUInteger) sensitivity
+{
+  [self subclassResponsibility: _cmd];
+
+  return 0;
+}
+
+- (NSArray *) expandRoles: (NSArray *) roles
+{
+  return [container expandRoles: roles];
+}
+
+- (BOOL) subscriberCanModifyMessage
+{
+  BOOL rc;
+  NSArray *roles;
+ 
+  roles = [self activeUserRoles];
+ 
+  if (isNew)
+    rc = [roles containsObject: SOGoRole_ObjectCreator];
+  else
+    rc = ([roles containsObject: SOGoCalendarRole_ComponentModifier]
+          || [roles containsObject: SOGoCalendarRole_ComponentResponder]);
+
+  /* Check if the message is owned and it has permission to edit it */
+  if (!rc && [roles containsObject: MAPIStoreRightEditOwn])
+    {
+      NSString *currentUser;
+
+      currentUser = [[container context] activeUser];
+      rc = [currentUser isEqual: [self ownerUser]];
+    }
+
+  if (!rc)
+    {
+      NSUInteger sensitivity;
+
+      /* Get sensitivity of the message to check if the user can
+         modify the message */
+      sensitivity = [self sensitivity];
+      /* FIXME: Use OpenChange constant names */
+      switch (sensitivity)
+        {
+        case 0:  /* PUBLIC */
+          rc = [roles containsObject: SOGoCalendarRole_PublicModifier]
+               || [roles containsObject: SOGoCalendarRole_PublicResponder];
+          break;
+        case 1:  /* PERSONAL */
+        case 2:  /* PRIVATE */
+          rc = [roles containsObject: SOGoCalendarRole_PrivateModifier]
+               || [roles containsObject: SOGoCalendarRole_PrivateResponder];
+          break;
+        case 3:  /* CONFIDENTIAL */
+          rc = [roles containsObject: SOGoCalendarRole_ConfidentialModifier]
+               || [roles containsObject: SOGoCalendarRole_ConfidentialResponder];
+        }
+    }
+  return rc;
+}
+
+- (BOOL) subscriberCanReadMessage
+{
+  NSArray *roles;
+
+  roles = [self activeUserRoles];
+
+  return ([roles containsObject: SOGoCalendarRole_ComponentViewer]
+          || [roles containsObject: SOGoCalendarRole_ComponentDAndTViewer]
+          || [self subscriberCanModifyMessage]);
+}
+
+@end
@@ -94,64 +94,64 @@
           flattenedValuesForKey: @""];
 }

- (int) getPidTagAttachmentHidden: (void **) data
-                         inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagAttachmentHidden: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  return [self getYes: data inMemCtx: localMemCtx];
 }

- (int) getPidTagAttachmentFlags: (void **) data
-                        inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagAttachmentFlags: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = MAPILongValue (localMemCtx, 0x00000002); /* afException */

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachmentLinkId: (void **) data
-                         inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagAttachmentLinkId: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  return [self getLongZero: data inMemCtx: localMemCtx];
 }

- (int) getPidTagAttachFlags: (void **) data
-                    inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagAttachFlags: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  return [self getLongZero: data inMemCtx: localMemCtx];
 }

- (int) getPidTagAttachMethod: (void **) data
-                     inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagAttachMethod: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = MAPILongValue (localMemCtx, afEmbeddedMessage);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachEncoding: (void **) data
-                      inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagAttachEncoding: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = [[NSData data] asBinaryInMemCtx: localMemCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagDisplayName: (void **) data
-                    inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagDisplayName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  *data = [@"Untitled" asUnicodeInMemCtx: localMemCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachmentContactPhoto: (void **) data
-                               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachmentContactPhoto: (void **) data
+                                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidTagExceptionReplaceTime: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagExceptionReplaceTime: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  enum mapistore_error rc;
  NSCalendarDate *dateValue;
@@ -178,8 +178,8 @@
  return rc;
 }

- (int) getPidTagExceptionStartTime: (void **) data
-                           inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagExceptionStartTime: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  enum mapistore_error rc;
  NSCalendarDate *dateValue;
@@ -205,8 +205,8 @@
  return rc;
 }

- (int) getPidTagExceptionEndTime: (void **) data
-                         inMemCtx: (TALLOC_CTX *) localMemCtx
+- (enum mapistore_error) getPidTagExceptionEndTime: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) localMemCtx
 {
  enum mapistore_error rc;
  NSCalendarDate *dateValue;
@@ -58,7 +58,6 @@
                wrapperWithICalEvent: [newContainer event]
                             andUser: [userContext sogoUser]
                      andSenderEmail: nil
-                          inTimeZone: [userContext timeZone]
                  withConnectionInfo: [context connectionInfo]];
      [self addProxy: appointmentWrapper];
    }
@@ -90,73 +89,73 @@
  *dataPtr = msgData;
 }

- (int) getPidTagMessageClass: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageClass: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = talloc_strdup (memCtx, "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}");

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMessageFlags: (void **) data // TODO
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageFlags: (void **) data // TODO
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, MSGFLAG_UNMODIFIED);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

- (int) getPidTagResponseRequested: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagResponseRequested: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

 /* discarded properties */

- (int) getPidLidAppointmentLastSequence: (void **)
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidAppointmentLastSequence: (void **)
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidLidMeetingWorkspaceUrl: (void **)
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidMeetingWorkspaceUrl: (void **)
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidLidContacts: (void **)
-                 inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidContacts: (void **)
+                                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagSensitivity: (void **)
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSensitivity: (void **)
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidLidPrivate: (void **)
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidPrivate: (void **)
+                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidNameKeywords: (void **)
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameKeywords: (void **)
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidLidFExceptionalBody: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidFExceptionalBody: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }
@@ -209,6 +208,7 @@
  [[container event] updateFromMAPIProperties: properties
                                inUserContext: [self userContext]
                               withActiveUser: activeUser
+                                        isNew: NO
 				     inMemCtx: memCtx];
 }

@@ -23,9 +23,9 @@
 #ifndef MAPISTORECALENDARFOLDER_H
 #define MAPISTORECALENDARFOLDER_H

-#import "MAPIStoreGCSFolder.h"
+#import "MAPIStoreCalTaskFolder.h"

-@interface MAPIStoreCalendarFolder : MAPIStoreGCSFolder
+@interface MAPIStoreCalendarFolder : MAPIStoreCalTaskFolder

@end

@@ -63,24 +63,27 @@
  SOGoAppointmentObject *newEntry;
  NSString *name;

-  //[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];
+  [[self userContext] activate];

  name = [NSString stringWithFormat: @"%@.ics",
                   [SOGoObject globallyUniqueObjectId]];
  newEntry = [SOGoAppointmentObject objectWithName: name
                                       inContainer: sogoObject];
  [newEntry setIsNew: YES];
-  /* the WOContext is required here for resolving notification pages */
-  [newEntry setContext: [[self userContext] woContext]];
  newMessage = [MAPIStoreCalendarMessage mapiStoreObjectWithSOGoObject: newEntry
                                                           inContainer: self];
-
-  
  return newMessage;
 }

 - (NSArray *) rolesForExchangeRights: (uint32_t) rights
 {
+  /* Limitations
+
+     Following rights are not supported by SOGo specifically:
+
+     - CreateSubfolders: No calendar subfolders
+     - FolderVisible: It is inferred by other rights when extracting
+   */
  NSMutableArray *roles;

  roles = [NSMutableArray arrayWithCapacity: 6];
@@ -88,26 +91,35 @@
    [roles addObject: SOGoRole_ObjectCreator];
  if (rights & RightsDeleteAll)
    [roles addObject: SOGoRole_ObjectEraser];
+  if (rights & RightsDeleteOwn)
+    [roles addObject: MAPIStoreRightDeleteOwn];
+
  if (rights & RightsEditAll)
    {
      [roles addObject: SOGoCalendarRole_PublicModifier];
      [roles addObject: SOGoCalendarRole_PrivateModifier];
      [roles addObject: SOGoCalendarRole_ConfidentialModifier];
    }
-  else if (rights & RightsReadItems)
+  if (rights & RightsEditOwn)
+    [roles addObject: MAPIStoreRightEditOwn];
+
+  if (rights & RightsReadItems)
    {
      [roles addObject: SOGoCalendarRole_PublicViewer];
      [roles addObject: SOGoCalendarRole_PrivateViewer];
      [roles addObject: SOGoCalendarRole_ConfidentialViewer];
    }
  if (rights & RightsFreeBusySimple)
-    {
-      [roles addObject: SOGoCalendarRole_PublicDAndTViewer];
-    }
+    [roles addObject: SOGoCalendarRole_PublicDAndTViewer];
+
  if (rights & RightsFreeBusyDetailed)
-    {
-      [roles addObject: SOGoCalendarRole_ConfidentialDAndTViewer];
-    }
+    [roles addObject: SOGoCalendarRole_ConfidentialDAndTViewer];
+
+  if (rights & RightsFolderOwner)
+    [roles addObject: MAPIStoreRightFolderOwner];
+
+  if (rights & RightsFolderContact)
+    [roles addObject: MAPIStoreRightFolderContact];

  // [self logWithFormat: @"roles for rights %.8x = (%@)", rights, roles];

@@ -121,27 +133,36 @@
  if ([roles containsObject: SOGoRole_ObjectCreator])
    rights |= RightsCreateItems;
  if ([roles containsObject: SOGoRole_ObjectEraser])
-    rights |= RightsDeleteAll;
+    rights |= RightsDeleteAll | RightsDeleteOwn;
  if ([roles containsObject: SOGoCalendarRole_PublicModifier]
      && [roles containsObject: SOGoCalendarRole_PrivateModifier]
      && [roles containsObject: SOGoCalendarRole_ConfidentialModifier])
-    rights |= RightsReadItems | RightsEditAll;
+    rights |= RightsReadItems | RightsEditAll | RightsEditOwn | RightsFreeBusySimple | RightsFreeBusyDetailed;
  else if ([roles containsObject: SOGoCalendarRole_PublicViewer]
           && [roles containsObject: SOGoCalendarRole_PrivateViewer]
           && [roles containsObject: SOGoCalendarRole_ConfidentialViewer])
-    // We have to set by hand other rights as only the highest role is returned
-    // See SOGoAppointmentFolder.m:aclsForUser for details
-    rights |= RightsReadItems | RightsFreeBusySimple | RightsFreeBusyDetailed;
+    rights |= RightsReadItems;
+
+  if ([roles containsObject: MAPIStoreRightEditOwn])
+    rights |= RightsEditOwn;
+  if ([roles containsObject: MAPIStoreRightDeleteOwn])
+    rights |= RightsDeleteOwn;

  if ([roles containsObject: SOGoCalendarRole_PublicDAndTViewer])
      rights |= RightsFreeBusySimple;

  if ([roles containsObject: SOGoCalendarRole_ConfidentialDAndTViewer])
-      rights |= RightsFreeBusyDetailed;
+      rights |= RightsFreeBusySimple | RightsFreeBusyDetailed;

-  if (rights != 0)
+  if ((rights & RightsReadItems) != 0 || (rights & RightsCreateItems) != 0 || (rights & RightsDeleteAll) != 0)
    rights |= RoleNone; /* actually "folder visible" */

+  if ([roles containsObject: MAPIStoreRightFolderOwner])
+    rights |= RightsFolderOwner | RoleNone;
+
+  if ([roles containsObject: MAPIStoreRightFolderContact])
+    rights |= RightsFolderContact;
+
  // [self logWithFormat: @"rights for roles (%@) = %.8x", roles, rights];

  return rights;
@@ -186,16 +207,16 @@
            [(SOGoAppointmentFolder *) sogoObject aclSQLListingFilter]];
 }

- (int) getPidTagContainerClass: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagContainerClass: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPF.Appointment" asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagDefaultPostMessageClass: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDefaultPostMessageClass: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Appointment" asUnicodeInMemCtx: memCtx];

@@ -23,13 +23,13 @@
 #ifndef MAPISTORECALENDARMESSAGE_H
 #define MAPISTORECALENDARMESSAGE_H

-#import "MAPIStoreGCSMessage.h"
+#import "MAPIStoreCalTaskMessage.h"

@class iCalCalendar;
@class iCalEvent;
@class MAPIStoreAppointmentWrapper;

-@interface MAPIStoreCalendarMessage : MAPIStoreGCSMessage
+@interface MAPIStoreCalendarMessage : MAPIStoreCalTaskMessage
 {
  iCalCalendar *calendar;
  iCalEvent *masterEvent;
@@ -197,7 +197,6 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
        = [MAPIStoreAppointmentWrapper wrapperWithICalEvent: masterEvent
                                                    andUser: [userContext sogoUser]
                                             andSenderEmail: nil
-                                                 inTimeZone: [userContext timeZone]
                                         withConnectionInfo: [context connectionInfo]];
      [self addProxy: appointmentWrapper];
    }
@@ -229,8 +228,8 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;


 /* getters */
- (int) getPidTagMessageClass: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageClass: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  SOGoUser *owner;

@@ -243,8 +242,8 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidSideEffects: (void **) data // TODO
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSideEffects: (void **) data // TODO
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx,
                         seOpenToDelete | seOpenToCopy | seOpenToMove
@@ -253,7 +252,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }
@@ -348,8 +347,8 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  *dataPtr = msgData;
 }

- (int) getPidTagResponseRequested: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagResponseRequested: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }
@@ -359,8 +358,8 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
   MAPIStoreMessage base class, then the proxy method is not reached
   (see MAPIStoreObject).
 */
- (int) getPidTagNormalizedSubject: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagNormalizedSubject: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStoreAppointmentWrapper *appointmentWrapper;

@@ -371,8 +370,8 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagSensitivity: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSensitivity: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStoreAppointmentWrapper *appointmentWrapper;

@@ -383,8 +382,8 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagImportance: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagImportance: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStoreAppointmentWrapper *appointmentWrapper;

@@ -494,6 +493,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  folder = [sogoObject container];

  /* reinstantiate the old sogo object and attach it to self */
+  [[self userContext] activate];
  woContext = [[self userContext] woContext];
  if (isNew)
    {
@@ -528,29 +528,19 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  ASSIGN (sogoObject, newObject);
 }

- (BOOL) subscriberCanReadMessage
+- (NSUInteger) sensitivity
 {
-  NSArray *roles;
-
-  roles = [self activeUserRoles];
-
-  return ([roles containsObject: SOGoCalendarRole_ComponentViewer]
-          || [roles containsObject: SOGoCalendarRole_ComponentDAndTViewer]
-          || [self subscriberCanModifyMessage]);
+  return [[self _appointmentWrapper] sensitivity];
 }

- (BOOL) subscriberCanModifyMessage
+- (NSString *) creator
 {
-  BOOL rc;
-  NSArray *roles = [self activeUserRoles];
+  return [[self _appointmentWrapper] creator];
+}

-  if (isNew)
-    rc = [roles containsObject: SOGoRole_ObjectCreator];
-  else
-    rc = ([roles containsObject: SOGoCalendarRole_ComponentModifier]
-          || [roles containsObject: SOGoCalendarRole_ComponentResponder]);
-
-  return rc;
+- (NSString *) owner
+{
+  return [[self _appointmentWrapper] owner];
 }

 - (void) _updateAttachedEvents
@@ -577,7 +567,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
    }
 }

- (void) save: (TALLOC_CTX *) memCtx 
+- (void) save: (TALLOC_CTX *) memCtx
 {
  // iCalCalendar *vCalendar;
  // NSCalendarDate *now;
@@ -632,9 +622,10 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  [masterEvent updateFromMAPIProperties: properties
                          inUserContext: [self userContext]
                         withActiveUser: activeUser
+                                  isNew: isNew
 	                       inMemCtx: memCtx];
  [self _updateAttachedEvents];
-  [[self userContext] activateWithUser: activeUser];
+  [[self userContext] activate];
  [sogoObject updateContentWithCalendar: calendar
                            fromRequest: nil];
  [self updateVersions];
@@ -670,7 +661,7 @@ static Class NSArrayK, MAPIStoreAppointmentWrapperK;
  return newAttachment;
 }

- (int) setReadFlag: (uint8_t) flag
+- (enum mapistore_error) setReadFlag: (uint8_t) flag
 {
  return MAPISTORE_SUCCESS;
 }
@@ -92,52 +92,52 @@
  return [container lastModificationTime];
 }

- (int) getPidTagAttachEncoding: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagAttachEncoding: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
 {
  *data = [[NSData data] asBinaryInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachFlags: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachFlags: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagAttachmentFlags: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachmentFlags: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagAttachmentHidden: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachmentHidden: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidTagAttachmentLinkId: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachmentLinkId: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagAttachMethod: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachMethod: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0x00000001);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachmentContactPhoto: (void **) data
-                               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachmentContactPhoto: (void **) data
+                                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

- (int) getPidTagAttachDataBinary: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachDataBinary: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  if (!photoData)
    ASSIGN (photoData,
@@ -148,8 +148,8 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachSize: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachSize: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  if (!photoData)
    ASSIGN (photoData,
@@ -160,16 +160,16 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachExtension: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachExtension: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self fileExtension] asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachLongFilename: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachLongFilename: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *filename;

@@ -181,15 +181,15 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachFilename: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachFilename: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagAttachLongFilename: data
                                  inMemCtx: memCtx];
 }

- (int) getPidTagDisplayName: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagAttachLongFilename: data inMemCtx: memCtx];
 }
@@ -28,6 +28,7 @@
 #import <Contacts/SOGoContactFolders.h>

 #import "MAPIApplication.h"
+#import "MAPIStoreUserContext.h"
 #import "MAPIStoreContactsContext.h"
 #import "MAPIStoreContactsMessage.h"
 #import "MAPIStoreContactsMessageTable.h"
@@ -58,10 +59,12 @@
  SOGoContactGCSEntry *newEntry;
  NSString *name;

+  [[self userContext] activate];
+
  name = [NSString stringWithFormat: @"%@.vcf",
                   [SOGoObject globallyUniqueObjectId]];
  newEntry = [SOGoContactGCSEntry objectWithName: name
-				     inContainer: sogoObject];
+                                     inContainer: sogoObject];
  [newEntry setIsNew: YES];
  newMessage = [MAPIStoreContactsMessage mapiStoreObjectWithSOGoObject: newEntry
                                                           inContainer: self];
@@ -71,18 +74,34 @@

 - (NSArray *) rolesForExchangeRights: (uint32_t) rights
 {
+  /* Limitations
+
+     Following rights are not supported by SOGo specifically:
+
+     - CreateSubfolders: No contacts subfolders
+     - FolderVisible: It is inferred by other rights when extracting
+   */
  NSMutableArray *roles;

-  roles = [NSMutableArray arrayWithCapacity: 6];
+  roles = [NSMutableArray arrayWithCapacity: 8];
  if (rights & RightsCreateItems)
    [roles addObject: SOGoRole_ObjectCreator];
  if (rights & RightsDeleteAll)
    [roles addObject: SOGoRole_ObjectEraser];
+  if (rights & RightsDeleteOwn)
+    [roles addObject: MAPIStoreRightDeleteOwn];
  if (rights & RightsEditAll)
    [roles addObject: SOGoRole_ObjectEditor];
+  if (rights & RightsEditOwn)
+    [roles addObject: MAPIStoreRightEditOwn];
  if (rights & RightsReadItems)
    [roles addObject: SOGoRole_ObjectViewer];

+  if (rights & RightsFolderOwner)
+    [roles addObject: MAPIStoreRightFolderOwner];
+  if (rights & RightsFolderContact)
+    [roles addObject: MAPIStoreRightFolderContact];
+
  return roles;
 }

@@ -92,15 +111,28 @@

  if ([roles containsObject: SOGoRole_ObjectCreator])
    rights |= RightsCreateItems;
+
  if ([roles containsObject: SOGoRole_ObjectEraser])
-    rights |= RightsDeleteAll;
+    rights |= RightsDeleteAll | RightsDeleteOwn;
+  else if ([roles containsObject: MAPIStoreRightDeleteOwn])
+    rights |= RightsDeleteOwn;
+
  if ([roles containsObject: SOGoRole_ObjectEditor])
-    rights |= RightsEditAll;
+    rights |= RightsEditAll | RightsEditOwn;
+  else if ([roles containsObject: MAPIStoreRightEditOwn])
+    rights |= RightsEditOwn;
+
  if ([roles containsObject: SOGoRole_ObjectViewer])
    rights |= RightsReadItems;
  if (rights != 0)
    rights |= RoleNone; /* actually "folder visible" */
- 
+
+  if ([roles containsObject: MAPIStoreRightFolderOwner])
+    rights |= RightsFolderOwner | RoleNone;
+
+  if ([roles containsObject: MAPIStoreRightFolderContact])
+    rights |= RightsFolderContact;
+
  return rights;
 }

@@ -114,8 +146,8 @@
  return [[self activeUserRoles] containsObject: SOGoRole_ObjectViewer];
 }

- (int) getPidTagDefaultPostMessageClass: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDefaultPostMessageClass: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Contact" asUnicodeInMemCtx: memCtx];

@@ -72,10 +72,10 @@
                                  forUser: (NSString *) username
                                 withRole: (enum mapistore_context_role) role;

-+ (int) openContext: (MAPIStoreContext **) contextPtr
-            withURI: (const char *) newUri
-     connectionInfo: (struct mapistore_connection_info *) newConnInfo
-     andTDBIndexing: (struct indexing_context *) indexing;
+ (enum mapistore_error) openContext: (MAPIStoreContext **) contextPtr
+                             withURI: (const char *) newUri
+                      connectionInfo: (struct mapistore_connection_info *) newConnInfo
+                      andTDBIndexing: (struct indexing_context *) indexing;

 - (id)   initFromURL: (NSURL *) newUri
  withConnectionInfo: (struct mapistore_connection_info *) newConnInfo
@@ -91,11 +91,11 @@
 // - (id) lookupObject: (NSString *) objectURLString;

 /* backend methods */
- (int) getPath: (char **) path
-         ofFMID: (uint64_t) fmid
-       inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getRootFolder: (MAPIStoreFolder **) folderPtr
-              withFID: (uint64_t) fmid;
+- (enum mapistore_error) getPath: (char **) path
+                          ofFMID: (uint64_t) fmid
+                        inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getRootFolder: (MAPIStoreFolder **) folderPtr
+                               withFID: (uint64_t) fmid;

 /* util methods */
 - (NSString *) extractChildNameFromURL: (NSString *) childURL
@@ -33,7 +33,6 @@
 #import <SOGo/SOGoUser.h>

 #import "MAPIStoreAttachment.h"
-// #import "MAPIStoreAttachmentTable.h"
 #import "MAPIStoreFallbackContext.h"
 #import "MAPIStoreFolder.h"
 #import "MAPIStoreFolderTable.h"
@@ -89,32 +88,31 @@ static NSMutableDictionary *contextClassMapping;
      currentClass = [classes objectAtIndex: count];
      moduleName = [currentClass MAPIModuleName];
      if (moduleName)
-	{
-	  [contextClassMapping setObject: currentClass
+        {
+          [contextClassMapping setObject: currentClass
                                  forKey: moduleName];
-	  NSLog (@"  registered class '%@' as handler of '%@' contexts",
-		 NSStringFromClass (currentClass), moduleName);
-	}
+          NSLog (@"  registered class '%@' as handler of '%@' contexts",
+                 NSStringFromClass (currentClass), moduleName);
+        }
    }

  MAPIStoreFallbackContextK = [MAPIStoreFallbackContext class];
 }

 + (struct mapistore_contexts_list *) listAllContextsForUser: (NSString *)  userName
-                                            withIndexing: (struct indexing_context *) indexing
+                                               withIndexing: (struct indexing_context *) indexing
                                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  struct mapistore_contexts_list *list, *current;
  NSArray *classes;
  Class currentClass;
  NSUInteger count, max;
-  MAPIStoreUserContext *userContext;

  list = NULL;

-  userContext = [MAPIStoreUserContext userContextWithUsername: userName
-                                               andTDBIndexing: indexing];
-  [userContext activateWithUser: [userContext sogoUser]];
+  // User context is activated on initialization
+  [MAPIStoreUserContext userContextWithUsername: userName
+                                 andTDBIndexing: indexing];

  classes = GSObjCAllSubclassesOfClass (self);
  max = [classes count];
@@ -122,7 +120,7 @@ static NSMutableDictionary *contextClassMapping;
    {
      currentClass = [classes objectAtIndex: count];
      current = [currentClass listContextsForUser: userName
-                                  withIndexing: indexing
+                                     withIndexing: indexing
                                         inMemCtx: memCtx];
      if (current)
        DLIST_CONCATENATE(list, current, void);
@@ -132,7 +130,7 @@ static NSMutableDictionary *contextClassMapping;
 }

 + (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName
-                                         withIndexing: (struct indexing_context *) indexing
+                                            withIndexing: (struct indexing_context *) indexing
                                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return NULL;
@@ -214,18 +212,16 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  return completeURL;
 }

-+ (int) openContext: (MAPIStoreContext **) contextPtr
-            withURI: (const char *) newUri
-     connectionInfo: (struct mapistore_connection_info *) newConnInfo
-     andTDBIndexing: (struct indexing_context *) indexing
+ (enum mapistore_error) openContext: (MAPIStoreContext **) contextPtr
+                             withURI: (const char *) newUri
+                      connectionInfo: (struct mapistore_connection_info *) newConnInfo
+                      andTDBIndexing: (struct indexing_context *) indexing
 {
  MAPIStoreContext *context;
  Class contextClass;
  NSString *module;
  NSURL *baseURL;
-  int rc = MAPISTORE_ERR_NOT_FOUND;
-
-  //NSLog (@"METHOD '%s' (%d) -- uri: '%s'", __FUNCTION__, __LINE__, newUri);
+  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;

  context = nil;

@@ -298,13 +294,6 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
      ASSIGN (userContext,
              [MAPIStoreUserContext userContextWithUsername: username
                                             andTDBIndexing: indexing]);
-
-#if 0
-      mapistore_mgmt_backend_register_user (newConnInfo,
-                                            "SOGo",
-                                            [username UTF8String]);
-#endif
-
      connInfo = newConnInfo;
      username = [NSString stringWithUTF8String: newConnInfo->username];
      ASSIGN (activeUser, [SOGoUser userWithLogin: username]);
@@ -322,12 +311,6 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)

 - (void) dealloc
 {
-#if 0
-  mapistore_mgmt_backend_unregister_user ([self connectionInfo], "SOGo", 
-                                          [[userContext username]
-                                            UTF8String]);
-#endif
-
  [contextUrl release];
  [userContext release];
  [containersBag release];
@@ -355,27 +338,16 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  return activeUser;
 }

-// - (void) logRestriction: (struct mapi_SRestriction *) res
-// 	      withState: (MAPIRestrictionState) state
-// {
-//   NSString *resStr;
-
-//   resStr = MAPIStringForRestriction (res);
-
-//   [self logWithFormat: @"%@  -->  %@", resStr, MAPIStringForRestrictionState (state)];
-// }
-
- (int) getPath: (char **) path
-         ofFMID: (uint64_t) fmid
-       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPath: (char **) path
+                          ofFMID: (uint64_t) fmid
+                        inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
  NSString *objectURL, *url;
-  // TDB_DATA key, dbuf;

  url = [contextUrl absoluteString];
  // FIXME transform percent escapes but not for user part of the url
-  //stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+  //[xxxx stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
  objectURL = [[userContext mapping] urlFromID: fmid];
  if (objectURL)
    {
@@ -396,14 +368,6 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  else
    {
      [self errorWithFormat: @"%s: you should *never* get here", __PRETTY_FUNCTION__];
-      // /* attempt to populate our mapping dict with data from indexing.tdb */
-      // key.dptr = (unsigned char *) talloc_asprintf (memCtx, "0x%.16llx",
-      //                                               (long long unsigned int )fmid);
-      // key.dsize = strlen ((const char *) key.dptr);
-
-      // dbuf = tdb_fetch (memCtx->indexing_list->index_ctx->tdb, key);
-      // talloc_free (key.dptr);
-      // uri = talloc_strndup (memCtx, (const char *)dbuf.dptr, dbuf.dsize);
      *path = NULL;
      rc = MAPISTORE_SUCCESS;
    }
@@ -415,8 +379,8 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 {
 }

- (int) getRootFolder: (MAPIStoreFolder **) folderPtr
-              withFID: (uint64_t) newFid
+- (enum mapistore_error) getRootFolder: (MAPIStoreFolder **) folderPtr
+                               withFID: (uint64_t) newFid
 {
  enum mapistore_error rc;
  MAPIStoreFolder *baseFolder;
@@ -426,7 +390,7 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  NSArray *pathComponents;
  NSUInteger count, max;

-  [userContext activateWithUser: activeUser];
+  [userContext activate];
  woContext = [userContext woContext];

  [self ensureContextFolder];
@@ -474,8 +438,16 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
                     mapiStoreObjectWithSOGoObject: currentFolder
                                       inContainer: nil];
      [baseFolder setContext: self];
-      *folderPtr = baseFolder;
-      rc = MAPISTORE_SUCCESS;
+
+      if ([[userContext sogoUser] isEqual: activeUser]
+          || [baseFolder subscriberCanReadMessages])
+        {
+          *folderPtr = baseFolder;
+          rc = MAPISTORE_SUCCESS;
+        }
+      else
+        rc = MAPISTORE_ERR_DENIED;
+
    }
  else if ([[userContext sogoUser] isEqual: activeUser])
    rc = MAPISTORE_ERR_NOT_FOUND;
@@ -488,7 +460,7 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 /* utils */

 - (NSString *) extractChildNameFromURL: (NSString *) objectURL
-			andFolderURLAt: (NSString **) folderURL;
+                        andFolderURLAt: (NSString **) folderURL;
 {
  NSString *childKey;
  NSRange lastSlash;
@@ -497,15 +469,15 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  if ([objectURL hasSuffix: @"/"])
    objectURL = [objectURL substringToIndex: [objectURL length] - 2];
  lastSlash = [objectURL rangeOfString: @"/"
-			       options: NSBackwardsSearch];
+                               options: NSBackwardsSearch];
  if (lastSlash.location != NSNotFound)
    {
      slashPtr = NSMaxRange (lastSlash);
      childKey = [objectURL substringFromIndex: slashPtr];
      if ([childKey length] == 0)
-	childKey = nil;
+        childKey = nil;
      if (folderURL)
-	*folderURL = [objectURL substringToIndex: slashPtr];
+        *folderURL = [objectURL substringToIndex: slashPtr];
    }
  else
    childKey = nil;
@@ -516,11 +488,10 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
 - (uint64_t) idForObjectWithKey: (NSString *) key
                    inFolderURL: (NSString *) folderURL
 {
-  NSString *childURL, *owner;
+  NSString *childURL;
  MAPIStoreMapping *mapping;
  uint64_t mappingId;
-  uint32_t contextId;
-  void *rootObject;
+  enum mapistore_error ret;

  if (key)
    childURL = [NSString stringWithFormat: @"%@%@", folderURL,
@@ -531,52 +502,71 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  mappingId = [mapping idFromURL: childURL];
  if (mappingId == NSNotFound)
    {
-      //[self warnWithFormat: @"no id exist yet for '%@', requesting one...",
-      //      childURL];
-      mapistore_indexing_get_new_folderID (connInfo->mstore_ctx, &mappingId);
-      [mapping registerURL: childURL withID: mappingId];
-      contextId = 0;
+      const char *owner;

-      mapistore_search_context_by_uri (connInfo->mstore_ctx, [folderURL UTF8String],
-                                       &contextId, &rootObject);
-      owner = [userContext username];
-      mapistore_indexing_record_add_mid (connInfo->mstore_ctx, contextId,
-                                         [owner UTF8String], mappingId);
+      [self logWithFormat: @"No id exist yet for '%@', requesting one", childURL];
+      owner = [[userContext username] UTF8String];
+      ret = mapistore_indexing_get_new_folderID_as_user (connInfo->mstore_ctx, owner, &mappingId);
+      if (ret == MAPISTORE_SUCCESS)
+        [mapping registerURL: childURL withID: mappingId];
+      else
+        [self errorWithFormat: @"Error trying to get new folder id (%d): %s",
+              ret, mapistore_errstr (ret)];
    }

  return mappingId;
 }

+/* Get new change number from openchange db interface using
+   resource's owner user */
 - (uint64_t) getNewChangeNumber
 {
+  const char *owner;
+  enum MAPISTATUS retval;
  uint64_t newVersionNumber;

-  if (openchangedb_get_new_changeNumber (connInfo->oc_ctx, connInfo->username, &newVersionNumber)
-      != MAPI_E_SUCCESS)
-    abort ();
+  owner = [[userContext username] UTF8String];
+  retval = openchangedb_get_new_changeNumber (connInfo->oc_ctx, owner, &newVersionNumber);
+  if (retval != MAPI_E_SUCCESS)
+    [NSException raise: @"MAPIStoreIOException"
+                format: @"Impossible to get new change number for %s: %s", owner,
+                 mapi_get_errstr (retval)];

  return newVersionNumber;
 }

+/* Get new change numbers from openchange db interface using
+   resource's owner user */
 - (NSArray *) getNewChangeNumbers: (uint64_t) max
 {
+  const char *owner;
+  enum MAPISTATUS retval;
  TALLOC_CTX *memCtx;
  NSMutableArray *newChangeNumbers;
  uint64_t count;
  struct UI8Array_r *numbers;
  NSString *newNumber;

-  memCtx = talloc_zero(NULL, TALLOC_CTX);
+  memCtx = talloc_new (NULL);
+  if (!memCtx)
+    [NSException raise: @"MAPIStoreIOException"
+                format: @"Not enough memory to allocate change numbers"];
+
  newChangeNumbers = [NSMutableArray arrayWithCapacity: max];
+  owner = [[userContext username] UTF8String];
+
+  retval = openchangedb_get_new_changeNumbers (connInfo->oc_ctx, memCtx, owner, max, &numbers);
+  if (retval != MAPI_E_SUCCESS || numbers->cValues != max)
+    {
+      talloc_free (memCtx);
+      [NSException raise: @"MAPIStoreIOException"
+                  format: @"Failing to get %d new change numbers: %s", max,
+                          mapi_get_errstr (retval)];
+    }

-  if (openchangedb_get_new_changeNumbers (connInfo->oc_ctx,
-                                          memCtx, connInfo->username, max, &numbers)
-      != MAPI_E_SUCCESS || numbers->cValues != max)
-    abort ();
  for (count = 0; count < max; count++)
    {
-      newNumber
-        = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
+      newNumber = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
      [newChangeNumbers addObject: newNumber];
    }

@@ -585,30 +575,31 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  return newChangeNumbers;
 }

+/* Get new fmids from mapistore_indexing interface using resource's
+   owner user */
 - (NSArray *) getNewFMIDs: (uint64_t) max
 {
-  TALLOC_CTX *memCtx;
+  const char *owner;
+  enum mapistore_error ret;
  NSMutableArray *newFMIDs;
-  uint64_t count;
-  struct UI8Array_r *numbers;
  NSString *newNumber;
+  uint64_t count, newFID;

-  memCtx = talloc_zero(NULL, TALLOC_CTX);
  newFMIDs = [NSMutableArray arrayWithCapacity: max];
-  
-  if (mapistore_indexing_get_new_folderIDs (connInfo->mstore_ctx,
-                                            memCtx, max, &numbers)
-      != MAPISTORE_SUCCESS || numbers->cValues != max)
-    abort ();
+  /* Get the resource's owner name */
+  owner = [[userContext username] UTF8String];
+
  for (count = 0; count < max; count++)
    {
-      newNumber
-        = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
+      ret = mapistore_indexing_get_new_folderID_as_user (connInfo->mstore_ctx, owner, &newFID);
+      if (ret != MAPISTORE_SUCCESS)
+          [NSException raise: @"MAPIStoreIOException"
+                      format: @"Impossible to get new fmid for %s", owner];
+
+      newNumber = [NSString stringWithUnsignedLongLong: newFID];
      [newFMIDs addObject: newNumber];
    }

-  talloc_free (memCtx);
-
  return newFMIDs;
 }

@@ -25,6 +25,16 @@

 #import "MAPIStoreFolder.h"

+extern NSString *MAPIStoreRightReadItems;
+extern NSString *MAPIStoreRightCreateItems;
+extern NSString *MAPIStoreRightEditOwn;
+extern NSString *MAPIStoreRightEditAll;
+extern NSString *MAPIStoreRightDeleteOwn;
+extern NSString *MAPIStoreRightDeleteAll;
+extern NSString *MAPIStoreRightCreateSubfolders;
+extern NSString *MAPIStoreRightFolderOwner;
+extern NSString *MAPIStoreRightFolderContact;
+
@interface MAPIStoreDBFolder : MAPIStoreFolder

@end
@@ -51,16 +51,6 @@

 static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;

-static NSString *MAPIStoreRightReadItems = @"RightsReadItems";
-static NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
-static NSString *MAPIStoreRightEditOwn = @"RightsEditOwn";
-static NSString *MAPIStoreRightEditAll = @"RightsEditAll";
-static NSString *MAPIStoreRightDeleteOwn = @"RightsDeleteOwn";
-static NSString *MAPIStoreRightDeleteAll = @"RightsDeleteAll";
-static NSString *MAPIStoreRightCreateSubfolders = @"RightsCreateSubfolders";
-static NSString *MAPIStoreRightFolderOwner = @"RightsFolderOwner";
-static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
-
@implementation MAPIStoreDBFolder

 + (void) initialize
@@ -102,7 +92,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
    {
      value = get_SPropValue_SRow (aRow, PidTagDisplayName_string8);
      if (value)
-        folderName = [NSString stringWithUTF8String: value->value.lpszA];
+        folderName = [NSString stringWithUTF8String: (const char *) value->value.lpszA];
      else
        folderName = nil;
    }
@@ -161,7 +151,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
      else
        [dbFolder changePathTo: [NSString stringWithFormat: @"/fallback/%@", pathComponent]
              intoNewContainer: nil];
-      
+
      mapping = [self mapping];

      if (targetFolder)
@@ -193,6 +183,8 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
  SOGoMAPIDBMessage *fsObject;
  NSString *newKey;

+  [[self userContext] activate];
+
  newKey = [NSString stringWithFormat: @"%@.plist",
                     [SOGoObject globallyUniqueObjectId]];
  fsObject = [SOGoMAPIDBMessage objectWithName: newKey
@@ -214,10 +206,13 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
  ownerUser = [[self userContext] sogoUser];
  if ([[context activeUser] isEqual: ownerUser]
      || [self subscriberCanReadMessages])
-    keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
-                                             includeDeleted: NO
-                                          matchingQualifier: qualifier
-                                           andSortOrderings: sortOrderings];
+    {
+      [[self userContext] activate];
+      keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
+                                                 includeDeleted: NO
+                                              matchingQualifier: qualifier
+                                               andSortOrderings: sortOrderings];
+    }
  else
    keys = [NSArray array];

@@ -227,6 +222,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 - (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
                         andSortOrderings: (NSArray *) sortOrderings
 {
+  [[self userContext] activate];
  return [dbFolder childKeysOfType: MAPIFolderCacheObject
                    includeDeleted: NO
                 matchingQualifier: qualifier
@@ -262,7 +258,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
      if ([date laterDate: fileDate] == fileDate)
        {
          //[self logWithFormat: @"current date: %@", date];
-          
+
          date = fileDate;
        }
    }
@@ -315,9 +311,9 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
  if ([roles containsObject: MAPIStoreRightDeleteOwn])
    rights |= RightsDeleteOwn;
  if ([roles containsObject: MAPIStoreRightEditAll])
-    rights |= RightsEditAll;
+    rights |= RightsEditAll | RightsEditOwn;
  if ([roles containsObject: MAPIStoreRightDeleteAll])
-    rights |= RightsDeleteAll;
+    rights |= RightsDeleteAll | RightsDeleteOwn;
  if ([roles containsObject: MAPIStoreRightCreateSubfolders])
    rights |= RightsCreateSubfolders;
  if ([roles containsObject: MAPIStoreRightFolderOwner])
@@ -326,7 +322,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
    rights |= RightsFolderContact;
  if (rights != 0)
    rights |= RoleNone; /* actually "folder visible" */
- 
+
  return rights;
 }

@@ -349,8 +345,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";

 - (BOOL) subscriberCanModifyMessages
 {
-  return ([self _testRoleForActiveUser: MAPIStoreRightEditAll]
-          || [self _testRoleForActiveUser: MAPIStoreRightEditOwn]);
+  return [self _testRoleForActiveUser: MAPIStoreRightEditAll];
 }

 - (BOOL) subscriberCanReadMessages
@@ -361,7 +356,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
     subscribed to read an open contained messages in order to enable them to
     find the "LocalFreebusy" message */
  [sogoObject reloadIfNeeded];
-  
+
  displayName = [[sogoObject properties]
                  objectForKey: MAPIPropertyKey (PidTagDisplayName)];

@@ -371,8 +366,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";

 - (BOOL) subscriberCanDeleteMessages
 {
-  return ([self _testRoleForActiveUser: MAPIStoreRightDeleteAll]
-          || [self _testRoleForActiveUser: MAPIStoreRightDeleteOwn]);
+  return [self _testRoleForActiveUser: MAPIStoreRightDeleteAll];
 }

 - (BOOL) subscriberCanCreateSubFolders
@@ -22,10 +22,14 @@

 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <SOGo/SOGoFolder.h>
+#import <SOGo/SOGoUser.h>

 #import "MAPIStoreContext.h"
 #import "MAPIStorePropertySelectors.h"
@@ -34,6 +38,7 @@
 #import "MAPIStoreDBFolder.h"
 #import "MAPIStoreDBMessage.h"
 #import "MAPIStoreTypes.h"
+#import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"

@@ -43,16 +48,28 @@

@implementation MAPIStoreDBMessage

-+ (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
-                      inMemCtx: (TALLOC_CTX *) memCtx
+ (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  struct SPropTagArray *properties;
  NSUInteger count;
-  enum MAPITAGS faiProperties[] = { 0x68350102, 0x683c0102, 0x683e0102,
-                                    0x683f0102, 0x68410003, 0x68420102,
-                                    0x68450102, 0x68460003,
-                                    // PR_VD_NAME_W, PR_VD_FLAGS, PR_VD_VERSION, PR_VIEW_CLSID
-                                    0x7006001F, 0x70030003, 0x70070003, 0x68330048 };
+
+  enum MAPITAGS faiProperties[] = {
+    0x68330048, /* PR_VIEW_CLSID */
+    0x68350102, /* PR_VIEW_STATE */
+    0x683c0102,
+    0x683d0040,
+    0x683e0102,
+    0x683f0102, /* PR_VIEW_VIEWTYPE_KEY */
+    0x68410003,
+    0x68420102,
+    0x68450102,
+    0x68460003,
+    0x7006001F, /* PR_VD_NAME_W */
+    0x70030003, /* PR_VD_FLAGS */
+    0x70070003  /* PR_VD_VERSION */
+  };
+
  size_t faiSize = sizeof(faiProperties) / sizeof(enum MAPITAGS);

  properties = talloc_zero (memCtx, struct SPropTagArray);
@@ -74,6 +91,13 @@
  return MAPISTORE_SUCCESS;
 }

+- (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                                       inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [[self class] getAvailableProperties: propertiesP
+                                     inMemCtx: memCtx];
+}
+
 - (id) initWithSOGoObject: (id) newSOGoObject
              inContainer: (MAPIStoreObject *) newContainer
 {
@@ -88,29 +112,180 @@
  return self;
 }

+- (NSString *) description
+{
+  id key, value;
+  NSEnumerator *propEnumerator;
+  NSMutableString *description;
+
+  description = [NSMutableString stringWithFormat: @"%@ %@. Properties: {", NSStringFromClass ([self class]),
+                                 [self url]];
+
+  propEnumerator = [properties keyEnumerator];
+  while ((key = [propEnumerator nextObject]))
+    {
+      uint32_t proptag = 0;
+      if ([key isKindOfClass: [NSString class]] && [(NSString *)key intValue] > 0)
+        proptag = [(NSString *)key intValue];
+      else if ([key isKindOfClass: [NSNumber class]])
+        proptag = [key unsignedLongValue];
+
+      if (proptag > 0)
+        {
+          const char *propTagName = get_proptag_name ([key unsignedLongValue]);
+          NSString *propName;
+
+          if (propTagName)
+            propName = [NSString stringWithCString: propTagName
+                                          encoding: NSUTF8StringEncoding];
+          else
+            propName = [NSString stringWithFormat: @"0x%.4x", [key unsignedLongValue]];
+
+          [description appendFormat: @"'%@': ", propName];
+        }
+      else
+        [description appendFormat: @"'%@': ", key];
+
+      value = [properties objectForKey: key];
+      [description appendFormat: @"%@ (%@), ", value, NSStringFromClass ([value class])];
+    }
+
+  [description appendString: @"}\n"];
+
+  return description;
+}
+
 - (uint64_t) objectVersion
 {
-  NSNumber *versionNbr;
+  /* Return the global counter from CN structure.
+     See [MS-OXCFXICS] Section 2.2.2.1 */
+  NSNumber *versionNbr, *cn;
  uint64_t objectVersion;

  [(SOGoMAPIDBMessage *) sogoObject reloadIfNeeded];
-  versionNbr = [properties objectForKey: @"version"];
+  versionNbr = [properties objectForKey: @"version_number"];
  if (versionNbr)
-    objectVersion = (([versionNbr unsignedLongLongValue] >> 16)
-                     & 0x0000ffffffffffffLL);
+    objectVersion = exchange_globcnt ([versionNbr unsignedLongLongValue]);
  else
-    objectVersion = ULLONG_MAX;
+    {
+      /* Old version which stored the CN structure not useful for searching */
+      cn = [properties objectForKey: @"version"];
+      if (cn)
+        objectVersion = (([cn unsignedLongLongValue] >> 16)
+                          & 0x0000ffffffffffffLL);
+      else
+        objectVersion = ULLONG_MAX;
+    }

  return objectVersion;
 }

+- (void) _updatePredecessorChangeList
+{
+  BOOL updated;
+  enum mapistore_error rc;
+  NSData *currentChangeList, *changeKey;
+  NSMutableArray *changeKeys;
+  NSMutableData *newChangeList;
+  NSUInteger count, len;
+  struct SizedXid *changes;
+  struct SPropValue property;
+  struct SRow aRow;
+  struct XID *currentChangeKey;
+  TALLOC_CTX *localMemCtx;
+  uint32_t nChanges;
+
+  localMemCtx = talloc_new (NULL);
+  if (!localMemCtx)
+    {
+      [self errorWithFormat: @"No more memory"];
+      return;
+    }
+
+  changeKey = [self getReplicaKeyFromGlobCnt: [self objectVersion]];
+
+  currentChangeList = [properties objectForKey: MAPIPropertyKey (PidTagPredecessorChangeList)];
+  if (!currentChangeList)
+    {
+      /* Create a new PredecessorChangeList */
+      len = [changeKey length];
+      newChangeList = [NSMutableData dataWithCapacity: len + 1];
+      [newChangeList appendUInt8: len];
+      [newChangeList appendData: changeKey];
+    }
+  else
+    {
+      /* Update current predecessor change list with new change key */
+      changes = [currentChangeList asSizedXidArrayInMemCtx: localMemCtx
+                                                      with: &nChanges];
+
+      updated = NO;
+      currentChangeKey = [changeKey asXIDInMemCtx: localMemCtx];
+      for (count = 0; count < nChanges && !updated; count++)
+        {
+          if (GUID_equal(&changes[count].XID.NameSpaceGuid, &currentChangeKey->NameSpaceGuid))
+            {
+              NSData *globCnt, *oldGlobCnt;
+              oldGlobCnt = [NSData dataWithBytes: changes[count].XID.LocalId.data length: changes[count].XID.LocalId.length];
+              globCnt = [NSData dataWithBytes: currentChangeKey->LocalId.data length: currentChangeKey->LocalId.length];
+              if ([globCnt compare: oldGlobCnt] == NSOrderedDescending)
+                {
+                  if ([globCnt length] != [oldGlobCnt length])
+                    {
+                      [self errorWithFormat: @"Cannot compare globcnt with different length: %@ and %@", globCnt, oldGlobCnt];
+                      abort();
+                    }
+                  memcpy (changes[count].XID.LocalId.data, currentChangeKey->LocalId.data, currentChangeKey->LocalId.length);
+                  updated = YES;
+                }
+            }
+        }
+
+      /* Serialise it */
+      changeKeys = [NSMutableArray array];
+
+      if (!updated)
+        [changeKeys addObject: changeKey];
+
+      for (count = 0; count < nChanges; count++)
+        {
+          changeKey = [NSData dataWithXID: &changes[count].XID];
+          [changeKeys addObject: changeKey];
+        }
+
+      [changeKeys sortUsingFunction: MAPIChangeKeyGUIDCompare context: localMemCtx];
+
+      newChangeList = [NSMutableData data];
+      len = [changeKeys count];
+      for (count = 0; count < len; count++)
+        {
+          changeKey = [changeKeys objectAtIndex: count];
+          [newChangeList appendUInt8: [changeKey length]];
+          [newChangeList appendData: changeKey];
+        }
+    }
+
+  if ([newChangeList length] > 0)
+    {
+      property.ulPropTag = PidTagPredecessorChangeList;
+      property.value.bin = *[newChangeList asBinaryInMemCtx: localMemCtx];
+      aRow.cValues = 1;
+      aRow.lpProps = &property;
+      rc = [self addPropertiesFromRow: &aRow];
+      if (rc != MAPISTORE_SUCCESS)
+          [self errorWithFormat: @"Impossible to add a new predecessor change list: %d", rc];
+    }
+
+  talloc_free (localMemCtx);
+}
+
 //
 // FIXME: how this can happen?
 //
 // We might get there if for some reasons, all classes weren't able
 // to tell us the message class.
 //
- (int) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];

@@ -119,10 +294,10 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getProperties: (struct mapistore_property_data *) data
-             withTags: (enum MAPITAGS *) tags
-             andCount: (uint16_t) columnCount
-             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getProperties: (struct mapistore_property_data *) data
+                              withTags: (enum MAPITAGS *) tags
+                              andCount: (uint16_t) columnCount
+                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  [sogoObject reloadIfNeeded];

@@ -132,12 +307,12 @@
                     inMemCtx: memCtx];
 }

- (int) getProperty: (void **) data
-            withTag: (enum MAPITAGS) propTag
-           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getProperty: (void **) data
+                             withTag: (enum MAPITAGS) propTag
+                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  id value;
-  int rc;
+  enum mapistore_error rc;
 
  value = [properties objectForKey: MAPIPropertyKey (propTag)];
  if (value)
@@ -163,10 +338,29 @@
    [properties setObject: attachmentParts forKey: @"attachments"];

  newVersion = [[self context] getNewChangeNumber];
-  [properties setObject: [NSNumber numberWithUnsignedLongLong: newVersion]
-                 forKey: @"version"];
+  newVersion = exchange_globcnt ((newVersion >> 16) & 0x0000ffffffffffffLL);

-  [self logWithFormat: @"%d props in dict", [properties count]];
+  [properties setObject: [NSNumber numberWithUnsignedLongLong: newVersion]
+                 forKey: @"version_number"];
+
+  /* Remove old version */
+  [properties removeObjectForKey: @"version"];
+
+  /* Update PredecessorChangeList accordingly */
+  [self _updatePredecessorChangeList];
+
+  if (isNew)
+    {
+      NSString *lastModifierName;
+
+      lastModifierName = (NSString *)[properties objectForKey: MAPIPropertyKey (PidTagLastModifierName)];
+      if ([lastModifierName length] > 0)
+        [properties setObject: lastModifierName
+                       forKey: MAPIPropertyKey (PidTagCreatorName)];
+    }
+
+  // [self logWithFormat: @"Saving %@", [self description]];
+  // [self logWithFormat: @"%d props in dict", [properties count]];

  [sogoObject save];
 }
@@ -183,20 +377,77 @@
  return [msgClass isEqualToString: @"IPM.Microsoft.ScheduleData.FreeBusy"];
 }

-/* TODO: differentiate between the "Own" and "All" cases */
+//-----------------------------
+// Permissions
+//-----------------------------
+
 - (BOOL) subscriberCanReadMessage
 {
  return [(MAPIStoreFolder *) container subscriberCanReadMessages];
-          // || [self _messageIsFreeBusy]);
+}
+
+- (SOGoUser *) _ownerUser
+{
+  NSString *ownerName;
+  SOGoUser *ownerUser = nil;
+
+  ownerName = [properties objectForKey: MAPIPropertyKey (PidTagCreatorName)];
+  if ([ownerName length] > 0)
+    ownerUser = [SOGoUser userWithLogin: ownerName];
+
+  return ownerUser;
+}
+
+- (NSArray *) activeUserRoles
+{
+  /* Override because of this exception: NSInvalidArgumentException,
+     reason: [SOGoMAPIDBMessage-aclsForUser:] should be overridden by
+     subclass */
+  if (!activeUserRoles)
+    {
+      SOGoUser *activeUser;
+
+      activeUser = [[self context] activeUser];
+      activeUserRoles = [[container aclFolder] aclsForUser: [activeUser login]];
+      [activeUserRoles retain];
+    }
+
+  return activeUserRoles;
 }

 - (BOOL) subscriberCanModifyMessage
 {
-  return ((isNew
-           && [(MAPIStoreFolder *) container subscriberCanCreateMessages])
-          || (!isNew
-              && [(MAPIStoreFolder *) container subscriberCanModifyMessages]));
-          // || [self _messageIsFreeBusy]);
+  BOOL rc;
+  NSArray *roles;
+
+  roles = [self activeUserRoles];
+
+  if (isNew)
+    rc = [(MAPIStoreFolder *) container subscriberCanCreateMessages];
+  else
+    rc = [roles containsObject: MAPIStoreRightEditAll];
+
+  /* Check if the message is owned and it has permission to edit it */
+  if (!rc && [roles containsObject: MAPIStoreRightEditOwn])
+    rc = [[[container context] activeUser] isEqual: [self _ownerUser]];
+
+  return rc;
+}
+
+- (BOOL) subscriberCanDeleteMessage
+{
+  BOOL rc;
+  NSArray *roles;
+
+  roles = [self activeUserRoles];
+
+  rc = [roles containsObject: MAPIStoreRightDeleteAll];
+
+  /* Check if the message is owned and it has permission to delete it */
+  if (!rc && [roles containsObject: MAPIStoreRightDeleteOwn])
+    rc = [[[container context] activeUser] isEqual: [self _ownerUser]];
+
+  return rc;
 }

 - (NSDate *) creationTime
@@ -209,4 +460,36 @@
  return [sogoObject lastModified];
 }

+- (enum mapistore_error) setReadFlag: (uint8_t) flag
+{
+  /* Modify PidTagMessageFlags from SetMessageReadFlag and
+     SyncImportReadStateChanges ROPs */
+  NSNumber *flags;
+  uint32_t newFlag;
+
+  flags = [properties objectForKey: MAPIPropertyKey (PR_MESSAGE_FLAGS)];
+  if (flags)
+    {
+      newFlag = [flags unsignedLongValue];
+      if (flag & SUPPRESS_RECEIPT)
+        newFlag |= MSGFLAG_READ;
+      if (flag & CLEAR_RN_PENDING)
+        newFlag &= ~MSGFLAG_RN_PENDING;
+      if (flag & CLEAR_READ_FLAG)
+        newFlag &= ~MSGFLAG_READ;
+      if (flag & CLEAR_NRN_PENDING)
+        newFlag &= ~MSGFLAG_NRN_PENDING;
+    }
+  else
+    {
+      newFlag = MSGFLAG_READ;
+      if (flag & CLEAR_READ_FLAG)
+        newFlag = 0x0;
+    }
+  [properties setObject: [NSNumber numberWithUnsignedLong: newFlag]
+                 forKey: MAPIPropertyKey (PR_MESSAGE_FLAGS)];
+
+  return MAPISTORE_SUCCESS;
+}
+
@end
@@ -61,14 +61,15 @@ static Class MAPIStoreDBMessageK = Nil;

  if ((uint32_t) res->ulPropTag == PidTagChangeNumber)
    {
+      SEL operator;
+
      value = NSObjectFromMAPISPropValue (&res->lpProp);
      cVersion = exchange_globcnt (([value unsignedLongLongValue] >> 16)
                                   & 0x0000ffffffffffffLL);
      version = [NSNumber numberWithUnsignedLongLong: cVersion];
-      //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
-      [self logWithFormat: @"  version: %.16lx", cVersion];
-      *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"version"
-                                           operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
+      operator = [self operatorFromRestrictionOperator: res->relop];
+      *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"version_number"
+                                           operatorSelector: operator
                                                      value: version];
      [*qualifier autorelease];
      rc = MAPIRestrictionStateNeedsEval;
@@ -56,81 +56,81 @@ static Class MAPIStoreAttachmentK;
           idForObjectWithKey: objectKey];
 }

- (int) getPidTagAccessLevel: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAccessLevel: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

 /* disabled properties */
- (int) getPidTagFolderId: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagFolderId: (void **) data
+                                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagChangeKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagChangeKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagSourceKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSourceKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagParentSourceKey: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagParentSourceKey: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagChangeNumber: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagChangeNumber: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagInstID: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagInstID: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagInstanceNum: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagInstanceNum: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagRowType: (void **) data
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagRowType: (void **) data
+                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagDepth: (void **) data
-              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDepth: (void **) data
+                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagIconIndex: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagIconIndex: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagGenerateExchangeViews: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagGenerateExchangeViews: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagOriginalMessageClass: (void **) dataa
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagOriginalMessageClass: (void **) dataa
+                                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }
@@ -24,6 +24,7 @@

 #import "MAPIStoreActiveTables.h"
 #import "MAPIStoreContext.h"
+#import "MAPIStoreFolder.h"
 #import "MAPIStoreUserContext.h"
 #import "NSObject+MAPIStore.h"

@@ -45,8 +46,8 @@
                         andType: MAPISTORE_FAI_TABLE];
 }

- (int) getPidTagAssociated: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAssociated: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }
@@ -69,7 +70,7 @@

 - (BOOL) subscriberCanReadMessage
 {
-  return NO;
+  return [(MAPIStoreFolder *)container subscriberCanReadMessages];
 }

 - (BOOL) subscriberCanModifyMessage
@@ -22,6 +22,7 @@
 #define MAPISTOREFOLDER_H

 #import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>

@class NSArray;
@class NSMutableArray;
@@ -41,6 +42,20 @@

 #import "MAPIStoreSOGoObject.h"

+/* MAPI Permissions
+
+   This set has only sogo-openchange library scope
+ */
+extern NSString *MAPIStoreRightReadItems;
+extern NSString *MAPIStoreRightCreateItems;
+extern NSString *MAPIStoreRightEditOwn;
+extern NSString *MAPIStoreRightEditAll;
+extern NSString *MAPIStoreRightDeleteOwn;
+extern NSString *MAPIStoreRightDeleteAll;
+extern NSString *MAPIStoreRightCreateSubfolders;
+extern NSString *MAPIStoreRightFolderOwner;
+extern NSString *MAPIStoreRightFolderContact;
+
@interface MAPIStoreFolder : MAPIStoreSOGoObject
 {
  MAPIStoreContext *context;
@@ -74,6 +89,8 @@
 - (MAPIStorePermissionsTable *) permissionsTable;
 - (NSArray *) permissionEntries;

+- (NSArray *) expandRoles: (NSArray *) roles;
+
 /* message objects and tables */
 - (id) lookupMessage: (NSString *) messageKey;
 - (NSArray *) messageKeys;
@@ -96,33 +113,34 @@

 /* backend interface */

- (int) openFolder: (MAPIStoreFolder **) childFolderPtr
-           withFID: (uint64_t) fid;
- (int) createFolder: (MAPIStoreFolder **) childFolderPtr
-             withRow: (struct SRow *) aRow
-              andFID: (uint64_t) fid;
- (int) deleteFolder;
- (int) getChildCount: (uint32_t *) rowCount
-          ofTableType: (enum mapistore_table_type) tableType;
+- (enum mapistore_error) openFolder: (MAPIStoreFolder **) childFolderPtr
+                            withFID: (uint64_t) fid;
+- (enum mapistore_error) createFolder: (MAPIStoreFolder **) childFolderPtr
+                              withRow: (struct SRow *) aRow
+                               andFID: (uint64_t) fid;
+- (enum mapistore_error) deleteFolder;
+- (enum mapistore_error) getChildCount: (uint32_t *) rowCount
+                           ofTableType: (enum mapistore_table_type) tableType;

- (int) createMessage: (MAPIStoreMessage **) messagePtr
-              withMID: (uint64_t) mid
-         isAssociated: (BOOL) isAssociated;
+- (enum mapistore_error) createMessage: (MAPIStoreMessage **) messagePtr
+                               withMID: (uint64_t) mid
+                          isAssociated: (BOOL) isAssociated;

- (int) openMessage: (MAPIStoreMessage **) messagePtr
-            withMID: (uint64_t) mid
-         forWriting: (BOOL) readWrite
-           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) deleteMessageWithMID: (uint64_t) mid
-                    andFlags: (uint8_t) flags;
+- (enum mapistore_error) openMessage: (MAPIStoreMessage **) messagePtr
+                             withMID: (uint64_t) mid
+                          forWriting: (BOOL) readWrite
+                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) deleteMessageWithMID: (uint64_t) mid
+                                     andFlags: (uint8_t) flags;

- (int) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
-                        andCount: (uint32_t) count
-                      fromFolder: (MAPIStoreFolder *) sourceFolder
-                        withMIDs: (uint64_t *) targetMids
-                   andChangeKeys: (struct Binary_r **) targetChangeKeys
-                        wantCopy: (uint8_t) want_copy
-                        inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
+                                         andCount: (uint32_t) count
+                                       fromFolder: (MAPIStoreFolder *) sourceFolder
+                                         withMIDs: (uint64_t *) targetMids
+                                    andChangeKeys: (struct Binary_r **) targetChangeKeys
+                        andPredecessorChangeLists: (struct Binary_r **) targetPredecessorChangeLists
+                                         wantCopy: (uint8_t) want_copy
+                                         inMemCtx: (TALLOC_CTX *) memCtx;

 - (enum mapistore_error) moveCopyToFolder: (MAPIStoreFolder *) targetFolder
                              withNewName: (NSString *) newFolderName
@@ -130,20 +148,20 @@
                              isRecursive: (BOOL) isRecursive
                          inMemCtx: (TALLOC_CTX *) memCtx;

- (int) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
-                  andCN: (uint64_t *) cnPtr
-       fromChangeNumber: (uint64_t) changeNum
-            inTableType: (enum mapistore_table_type) tableType
-               inMemCtx: (TALLOC_CTX *) mem_ctx;
+- (enum mapistore_error) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
+                                   andCN: (uint64_t *) cnPtr
+                        fromChangeNumber: (uint64_t) changeNum
+                             inTableType: (enum mapistore_table_type) tableType
+                                inMemCtx: (TALLOC_CTX *) mem_ctx;

- (int) getTable: (MAPIStoreTable **) tablePtr
-     andRowCount: (uint32_t *) count
-       tableType: (enum mapistore_table_type) tableType
-     andHandleId: (uint32_t) handleId;
+- (enum mapistore_error) getTable: (MAPIStoreTable **) tablePtr
+                      andRowCount: (uint32_t *) count
+                        tableType: (enum mapistore_table_type) tableType
+                      andHandleId: (uint32_t) handleId;

- (int) modifyPermissions: (struct PermissionData *) permissions
-                withCount: (uint16_t) pcount
-                 andFlags: (int8_t) flags;
+- (enum mapistore_error) modifyPermissions: (struct PermissionData *) permissions
+                                 withCount: (uint16_t) pcount
+                                  andFlags: (int8_t) flags;
 - (enum mapistore_error) preloadMessageBodiesWithMIDs: (const struct UI8Array_r *) mids
                                          ofTableType: (enum mapistore_table_type) tableType;

@@ -65,6 +65,17 @@

 Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMessageTableK, MAPIStoreFolderTableK;

+/* MAPI permissions */
+NSString *MAPIStoreRightReadItems = @"RightsReadItems";
+NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
+NSString *MAPIStoreRightEditOwn = @"RightsEditOwn";
+NSString *MAPIStoreRightEditAll = @"RightsEditAll";
+NSString *MAPIStoreRightDeleteOwn = @"RightsDeleteOwn";
+NSString *MAPIStoreRightDeleteAll = @"RightsDeleteAll";
+NSString *MAPIStoreRightCreateSubfolders = @"RightsCreateSubfolders";
+NSString *MAPIStoreRightFolderOwner = @"RightsFolderOwner";
+NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
+
@implementation MAPIStoreFolder

 + (void) initialize
@@ -120,6 +131,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
    folderName = [folderURL host];

  userContext = [self userContext];
+  [userContext activate];
  [userContext ensureFolderTableExists];

  ASSIGN (dbFolder,
@@ -231,30 +243,19 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

 - (id) lookupFolder: (NSString *) folderKey
 {
-  MAPIStoreFolder *childFolder;
+  MAPIStoreFolder *childFolder = nil;
  SOGoFolder *sogoFolder;
-  WOContext *woContext;

-  childFolder = nil;
  if ([[self folderKeys] containsObject: folderKey])
    {
-      woContext = [[self userContext] woContext];
-      /* We activate the user for the context using the root folder
-         context as there are times where the active user is not
-         matching with the one stored in the application context
-         and SOGo object is storing cached data with the wrong user */
-      [[self userContext] activateWithUser: [woContext activeUser]];
-      sogoFolder = [sogoObject lookupName: folderKey inContext: woContext
+      [[self userContext] activate];
+      sogoFolder = [sogoObject lookupName: folderKey
+                                inContext: nil
                                  acquire: NO];
      if (sogoFolder && ![sogoFolder isKindOfClass: NSExceptionK])
-        {
-          [sogoFolder setContext: woContext];
-          childFolder = [isa mapiStoreObjectWithSOGoObject: sogoFolder
-                                               inContainer: self];
-        }
+        childFolder = [isa mapiStoreObjectWithSOGoObject: sogoFolder
+                                             inContainer: self];
    }
-  else
-    childFolder = nil;

  return childFolder;
 }
@@ -285,6 +286,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

  if (messageKey)
    {
+      [[self userContext] activate];
      msgObject = [sogoObject lookupName: messageKey
                               inContext: nil
                                 acquire: NO];
@@ -314,6 +316,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

  if (messageKey)
    {
+      [[self userContext] activate];
      if ([[self faiMessageKeys] containsObject: messageKey])
        {
          msgObject = [dbFolder lookupName: messageKey
@@ -373,10 +376,10 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return foundObject;
 }

- (int) openFolder: (MAPIStoreFolder **) childFolderPtr
-           withFID: (uint64_t) fid
+- (enum mapistore_error) openFolder: (MAPIStoreFolder **) childFolderPtr
+                            withFID: (uint64_t) fid
 {
-  int rc = MAPISTORE_ERR_NOT_FOUND;
+  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
  MAPIStoreFolder *childFolder;
  MAPIStoreMapping *mapping;
  NSString *childURL;
@@ -398,9 +401,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) createFolder: (MAPIStoreFolder **) childFolderPtr
-             withRow: (struct SRow *) aRow
-              andFID: (uint64_t) fid
+- (enum mapistore_error) createFolder: (MAPIStoreFolder **) childFolderPtr
+                              withRow: (struct SRow *) aRow
+                               andFID: (uint64_t) fid
 {
  BOOL mapped;
  enum mapistore_error rc = MAPISTORE_SUCCESS;
@@ -455,7 +458,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) deleteFolder
+- (enum mapistore_error) deleteFolder
 {
  // TODO: raise exception in case underlying delete fails?
  // [propsMessage delete];
@@ -466,11 +469,11 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return MAPISTORE_SUCCESS;
 }

- (int) getChildCount: (uint32_t *) rowCount
-          ofTableType: (enum mapistore_table_type) tableType
+- (enum mapistore_error) getChildCount: (uint32_t *) rowCount
+                           ofTableType: (enum mapistore_table_type) tableType
 {
  NSArray *keys;
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;

  //[self logWithFormat: @"METHOD '%s' (%d) -- tableType: %d",
 	//__FUNCTION__, __LINE__, tableType];
@@ -491,16 +494,16 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) openMessage: (MAPIStoreMessage **) messagePtr
-            withMID: (uint64_t) mid
-         forWriting: (BOOL) readWrite
-           inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) openMessage: (MAPIStoreMessage **) messagePtr
+                             withMID: (uint64_t) mid
+                          forWriting: (BOOL) readWrite
+                            inMemCtx: (TALLOC_CTX *) memCtx;
 {
  NSString *messageURL;
  MAPIStoreMapping *mapping;
  MAPIStoreMessage *message;
  SOGoUser *ownerUser;
-  int rc = MAPISTORE_ERR_NOT_FOUND;
+  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;

  mapping = [self mapping];
  messageURL = [mapping urlFromID: mid];
@@ -531,9 +534,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) createMessage: (MAPIStoreMessage **) messagePtr
-              withMID: (uint64_t) mid
-         isAssociated: (BOOL) isAssociated
+- (enum mapistore_error) createMessage: (MAPIStoreMessage **) messagePtr
+                               withMID: (uint64_t) mid
+                          isAssociated: (BOOL) isAssociated
 {
  enum mapistore_error rc;
  MAPIStoreMessage *message;
@@ -546,6 +549,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

  context = [self context];
  ownerUser = [[self userContext] sogoUser];
+  [[self userContext] activate];

  if ([[context activeUser] isEqual: ownerUser]
      || (!isAssociated && [self subscriberCanCreateMessages]))
@@ -577,8 +581,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) deleteMessageWithMID: (uint64_t) mid
-                    andFlags: (uint8_t) flags
+- (enum mapistore_error) deleteMessageWithMID: (uint64_t) mid
+                                     andFlags: (uint8_t) flags
 {
  NSString *childURL;
  MAPIStoreMapping *mapping;
@@ -587,7 +591,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  NSUInteger count, max;
  id msgObject;
  SOGoUser *ownerUser;
-  int rc;
+  enum mapistore_error rc;

  /* flags that control the behaviour of the operation
     (MAPISTORE_SOFT_DELETE or MAPISTORE_PERMANENT_DELETE) */
@@ -604,7 +608,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

          if ([[context activeUser] isEqual: ownerUser]
              || (![message isKindOfClass: MAPIStoreFAIMessageK]
-                  && [self subscriberCanDeleteMessages]))
+                  && ([self subscriberCanDeleteMessages] || [message subscriberCanDeleteMessage])))
            {
              /* we ensure the table caches are loaded so that old and new state
                 can be compared */
@@ -645,14 +649,15 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 }

 // private method
- (int) _moveCopyMessageWithMID: (uint64_t) srcMid
-                     fromFolder: (MAPIStoreFolder *) sourceFolder
-                        withMID: (uint64_t) targetMid
-                   andChangeKey: (struct Binary_r *) targetChangeKey
-                       wantCopy: (uint8_t) wantCopy
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) _moveCopyMessageWithMID: (uint64_t) srcMid
+                                      fromFolder: (MAPIStoreFolder *) sourceFolder
+                                         withMID: (uint64_t) targetMid
+                                    andChangeKey: (struct Binary_r *) targetChangeKey
+                        andPredecessorChangeList: (struct Binary_r *) targetPredecessorChangeList
+                                        wantCopy: (uint8_t) wantCopy
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
  MAPIStoreMessage *sourceMsg, *destMsg;
  //TALLOC_CTX *memCtx;
  struct SRow aRow;
@@ -676,15 +681,18 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

  [sourceMsg copyToMessage: destMsg  inMemCtx: memCtx];

-  if (targetChangeKey)
+  if (targetPredecessorChangeList)
    {
-      property.ulPropTag = PidTagChangeKey;
-      property.value.bin = *targetChangeKey;
+      property.ulPropTag = PidTagPredecessorChangeList;
+      property.value.bin = *targetPredecessorChangeList;
      aRow.cValues = 1;
      aRow.lpProps = &property;
      rc = [destMsg addPropertiesFromRow: &aRow];
      if (rc != MAPISTORE_SUCCESS)
-        goto end;
+        {
+          [self errorWithFormat: @"Cannot add PredecessorChangeList on move"];
+          goto end;
+        }
    }
  [destMsg save: memCtx];
  if (!wantCopy)
@@ -698,21 +706,22 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
-                        andCount: (uint32_t) midCount
-                      fromFolder: (MAPIStoreFolder *) sourceFolder
-                        withMIDs: (uint64_t *) targetMids
-                   andChangeKeys: (struct Binary_r **) targetChangeKeys
-                        wantCopy: (uint8_t) wantCopy
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
+                                         andCount: (uint32_t) midCount
+                                       fromFolder: (MAPIStoreFolder *) sourceFolder
+                                         withMIDs: (uint64_t *) targetMids
+                                    andChangeKeys: (struct Binary_r **) targetChangeKeys
+                        andPredecessorChangeLists: (struct Binary_r **) targetPredecessorChangeLists
+                                         wantCopy: (uint8_t) wantCopy
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSUInteger count;
  NSMutableArray *oldMessageURLs;
  NSString *oldMessageURL;
  MAPIStoreMapping *mapping;
  SOGoUser *ownerUser;
-  struct Binary_r *targetChangeKey;
+  struct Binary_r *targetChangeKey, *targetPredecessorChangeList;
  //TALLOC_CTX *memCtx;

  //memCtx = talloc_zero (NULL, TALLOC_CTX);
@@ -733,14 +742,21 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
          if (oldMessageURL)
            {
              [oldMessageURLs addObject: oldMessageURL];
-              if (targetChangeKeys)
-                targetChangeKey = targetChangeKeys[count];
+              if (targetChangeKeys && targetPredecessorChangeList)
+                {
+                  targetChangeKey = targetChangeKeys[count];
+                  targetPredecessorChangeList = targetPredecessorChangeLists[count];
+                }
              else
-                targetChangeKey = NULL;
+                {
+                  targetChangeKey = NULL;
+                  targetPredecessorChangeList = NULL;
+                }
              rc = [self _moveCopyMessageWithMID: srcMids[count]
                                      fromFolder: sourceFolder
                                         withMID: targetMids[count]
                                    andChangeKey: targetChangeKey
+                        andPredecessorChangeList: targetPredecessorChangeList
                                        wantCopy: wantCopy
                                        inMemCtx: memCtx];
            }
@@ -758,9 +774,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
    }
  else
    rc = MAPISTORE_ERR_DENIED;
-  
+
  //talloc_free (memCtx);
-  
+
  return rc;
 }

@@ -903,6 +919,11 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return nil;
 }

+- (NSArray *) expandRoles: (NSArray *) roles
+{
+  return roles;
+}
+
 - (void) _modifyPermissionEntryForUser: (NSString *) user
                             withRoles: (NSArray *) roles
                            isAddition: (BOOL) isAddition
@@ -931,7 +952,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  NSArray *newIDs;
  uint64_t idNbr;
  bool softDeleted;
-  
+
  baseURL = [self url];

  mapping = [self mapping];
@@ -952,13 +973,13 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
                withIDs: newIDs];
 }

- (int) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
-                  andCN: (uint64_t *) cnPtr
-       fromChangeNumber: (uint64_t) changeNum
-            inTableType: (enum mapistore_table_type) tableType
-               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
+                                   andCN: (uint64_t *) cnPtr
+                        fromChangeNumber: (uint64_t) changeNum
+                             inTableType: (enum mapistore_table_type) tableType
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
  NSString *baseURL, *format, *url;
  NSArray *keys;
  NSNumber *cnNbr;
@@ -1011,14 +1032,15 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) getTable: (MAPIStoreTable **) tablePtr
-     andRowCount: (uint32_t *) countPtr
-       tableType: (enum mapistore_table_type) tableType
-     andHandleId: (uint32_t) handleId
+- (enum mapistore_error) getTable: (MAPIStoreTable **) tablePtr
+                      andRowCount: (uint32_t *) countPtr
+                        tableType: (enum mapistore_table_type) tableType
+                      andHandleId: (uint32_t) handleId
 {
-  int rc = MAPISTORE_SUCCESS;
+  BOOL access;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  MAPIStoreTable *table;
-  SOGoUser *ownerUser;
+  SOGoUser *activeUser, *ownerUser;

  if (tableType == MAPISTORE_MESSAGE_TABLE)
    table = [self messageTable];
@@ -1029,8 +1051,20 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  else if (tableType == MAPISTORE_PERMISSIONS_TABLE)
    {
      ownerUser = [[self userContext] sogoUser];
-      if ([[context activeUser] isEqual: ownerUser])
-        table = [self permissionsTable];
+      activeUser = [context activeUser];
+      access = [activeUser isEqual: ownerUser];
+      if (!access)
+        {
+          NSArray *roles;
+
+          roles = [[self aclFolder] aclsForUser: [activeUser login]];
+          roles = [self expandRoles: roles];  // Not required here
+          /* Check FolderVisible right to return the table */
+          access = ([self exchangeRightsForRoles: roles] & RoleNone) != 0;
+        }
+
+      if (access)
+          table = [self permissionsTable];
      else
        rc = MAPISTORE_ERR_DENIED;
    }
@@ -1060,9 +1094,10 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 {
  static enum MAPITAGS bannedProps[] = { PR_MID, PR_FID, PR_PARENT_FID,
                                         PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY,
-                                         PR_CHANGE_KEY, 0x00000000 };
+                                         PR_CHANGE_KEY, PidTagChangeNumber, 0x00000000 };
  enum MAPITAGS *currentProp;
  NSMutableDictionary *propsCopy;
+  uint64_t cn;

  /* TODO: this should no longer be required once mapistore v2 API is in
     place, when we can then do this from -dealloc below */
@@ -1080,6 +1115,12 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
    }

  [properties addEntriesFromDictionary: propsCopy];
+
+  /* Update change number after setting the properties */
+  cn = [[self context] getNewChangeNumber];
+  [properties setObject: [NSNumber numberWithUnsignedLongLong: cn]
+                 forKey: MAPIPropertyKey (PidTagChangeNumber)];
+
  [dbFolder save];
 }

@@ -1105,6 +1146,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 - (NSArray *) faiMessageKeysMatchingQualifier: (EOQualifier *) qualifier
                             andSortOrderings: (NSArray *) sortOrderings
 {
+  [[self userContext] activate];
  return [dbFolder childKeysOfType: MAPIFAICacheObject
                    includeDeleted: NO
                 matchingQualifier: qualifier
@@ -1195,16 +1237,16 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  // folderKeys = nil;
 }

- (int) getPidTagParentFolderId: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagParentFolderId: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongLongValue (memCtx, [container objectId]);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagFolderId: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagFolderId: (void **) data
+                                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongLongValue (memCtx, [self objectId]);

@@ -1213,7 +1255,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

 /*
  Possible values are:
-  
+
  0x00000001 Modify
  0x00000002 Read
  0x00000004 Delete
@@ -1221,8 +1263,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  0x00000010 Create Contents Table
  0x00000020 Create Associated Contents Table
 */
- (int) getPidTagAccess: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAccess: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t access = 0;
  SOGoUser *ownerUser;
@@ -1244,109 +1286,113 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
    access |= 0x10;
  if (userIsOwner)
    access |= 0x20;
-  
+
  *data = MAPILongValue (memCtx, access);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagRights: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagRights: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t rights = 0;
-  SOGoUser *ownerUser;
-  BOOL userIsOwner;
+  SOGoUser *activeUser, *ownerUser;

  ownerUser = [[self userContext] sogoUser];
+  activeUser = [context activeUser];
+
+  if ([activeUser isEqual: ownerUser])
+    {
+      rights = RightsReadItems | RightsCreateItems | RightsEditOwn | RightsEditAll
+        | RightsDeleteOwn | RightsDeleteAll | RightsFolderOwner | RightsFolderContact | RoleNone;
+      if ([self supportsSubFolders])
+        rights |= RightsCreateSubfolders;
+    }
+  else
+    {
+      NSArray *roles;
+
+      roles = [[self aclFolder] aclsForUser: [activeUser login]];
+      roles = [self expandRoles: roles];
+      rights = [self exchangeRightsForRoles: roles];
+      /* FreeBusySimple and FreeBusyDetailed does not apply here
+         [MS-OXCFOLD] Section 2.2.2.2.2.8 */
+      rights &= ~RightsFreeBusySimple & ~RightsFreeBusyDetailed;
+    }

-  userIsOwner = [[context activeUser] isEqual: ownerUser];
-  if (userIsOwner || [self subscriberCanReadMessages])
-    rights |= RightsReadItems;
-  if (userIsOwner || [self subscriberCanCreateMessages])
-    rights |= RightsCreateItems;
-  if (userIsOwner || [self subscriberCanModifyMessages])
-    rights |= RightsEditOwn | RightsEditAll;
-  if (userIsOwner || [self subscriberCanDeleteMessages])
-    rights |= RightsDeleteOwn | RightsDeleteAll;
-  if ((userIsOwner || [self subscriberCanCreateSubFolders])
-      && [self supportsSubFolders])
-    rights |= RightsCreateSubfolders;
-  if (userIsOwner)
-    rights |= RightsFolderOwner | RightsFolderContact;
-  
  *data = MAPILongValue (memCtx, rights);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAccessControlListData: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAccessControlListData: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[NSData data] asBinaryInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttributeHidden: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttributeHidden: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidTagAttributeSystem: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttributeSystem: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidTagAttributeReadOnly: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttributeReadOnly: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidTagSubfolders: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSubfolders: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPIBoolValue (memCtx, [self supportsSubFolders] && [[self folderKeys] count] > 0);
-  
+
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagFolderChildCount: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagFolderChildCount: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, [[self folderKeys] count]);
-  
+
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagContentCount: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagContentCount: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, [[self messageKeys] count]);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagContentUnreadCount: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagContentUnreadCount: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAssociatedContentCount: (void **) data
-                               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAssociatedContentCount: (void **) data
+                                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, [[self faiMessageKeys] count]);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagDeletedCountTotal: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDeletedCountTotal: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  /* TODO */
  *data = MAPILongValue (memCtx, 0);
@@ -1354,10 +1400,10 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagLocalCommitTimeMax: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagLocalCommitTimeMax: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSDate *date;

  date = [self lastMessageModificationTime];
@@ -1369,18 +1415,18 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  return rc;
 }

- (int) getPidTagDefaultPostMessageClass: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDefaultPostMessageClass: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getProperties: (struct mapistore_property_data *) data
-             withTags: (enum MAPITAGS *) tags
-             andCount: (uint16_t) columnCount
-             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getProperties: (struct mapistore_property_data *) data
+                              withTags: (enum MAPITAGS *) tags
+                              andCount: (uint16_t) columnCount
+                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  [dbFolder reloadIfNeeded];

@@ -1390,11 +1436,11 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
                     inMemCtx: memCtx];
 }

- (int) getProperty: (void **) data
-            withTag: (enum MAPITAGS) propTag
-           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getProperty: (void **) data
+                             withTag: (enum MAPITAGS) propTag
+                            inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
  id value;

  value = [properties objectForKey: MAPIPropertyKey (propTag)];
@@ -1419,7 +1465,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  [dbObject setIsNew: YES];
  newMessage = [MAPIStoreFAIMessageK mapiStoreObjectWithSOGoObject: dbObject
                                                       inContainer: self];
-  
+
  return newMessage;
 }

@@ -1428,6 +1474,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  MAPIStoreMessage *newMessage;
  WOContext *woContext;

+  [[self userContext] activate];
+
  if (isAssociated)
    newMessage = [self _createAssociatedMessage];
  else
@@ -1534,7 +1582,6 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  struct Binary_r bin32;
  struct AddressBookEntryId *entryId;
  NSString *username;
-  struct ldb_context *samCtx;

  if (bin && bin->cb)
    {
@@ -1544,8 +1591,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
      entryId = get_AddressBookEntryId (NULL, &bin32);
      if (entryId)
        {
-          samCtx = [[self context] connectionInfo]->sam_ctx;
-          username = MAPIStoreSamDBUserAttribute (samCtx, @"legacyExchangeDN",
+          username = MAPIStoreSamDBUserAttribute ([[self context] connectionInfo],
+                                                  @"legacyExchangeDN",
                                                  [NSString stringWithUTF8String: entryId->X500DN],
                                                  @"sAMAccountName");
        }
@@ -1600,9 +1647,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  [users release];
 }

- (int) modifyPermissions: (struct PermissionData *) permissions
-                withCount: (uint16_t) pcount
-                 andFlags: (int8_t) flags
+- (enum mapistore_error) modifyPermissions: (struct PermissionData *) permissions
+                                 withCount: (uint16_t) pcount
+                                  andFlags: (int8_t) flags
 {
  NSUInteger count, propCount;
  struct PermissionData *currentPermission;
@@ -1612,6 +1659,22 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  NSArray *permissionRoles;
  BOOL reset, isAdd = NO, isDelete = NO, isModify = NO;
  SOGoFolder *aclFolder;
+  SOGoUser *activeUser, *ownerUser;
+
+  /* Check if we have permissions to modify the permissions.
+   See [MS-OXCPERM] Section 3.2.5.2 for details */
+  ownerUser = [[self userContext] sogoUser];
+  activeUser = [context activeUser];
+  if (![activeUser isEqual: ownerUser])
+    {
+      /* Check if we have FolderOwner right */
+      NSArray *roles;
+
+      roles = [[self aclFolder] aclsForUser: [activeUser login]];
+      roles = [self expandRoles: roles]; // Not required
+      if (([self exchangeRightsForRoles: roles] & RightsFolderOwner) == 0)
+        return MAPISTORE_ERR_DENIED;
+    }

  aclFolder = [self aclFolder];

@@ -1627,7 +1690,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

      permissionUser = nil;
      permissionRoles = nil;
- 
+
      if (currentPermission->PermissionDataFlags == ROW_ADD)
        isAdd = YES;
      else if (currentPermission->PermissionDataFlags == ROW_MODIFY)
@@ -1778,7 +1841,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 {
  [self subclassResponsibility: _cmd];

-  return nil;  
+  return nil;
 }

 - (NSArray *) getDeletedKeysFromChangeNumber: (uint64_t) changeNum
@@ -121,7 +121,6 @@

  userContext = [MAPIStoreUserContext userContextWithUsername: userName
                                               andTDBIndexing: NULL];
-  [MAPIApp setUserContext: userContext];
  moduleName = [self MAPIModuleName];
  parentFolder = [[userContext rootFolders] objectForKey: moduleName];
  nameInContainer = nil;
@@ -134,7 +133,6 @@
                             moduleName, nameInContainer];
  else
    mapistoreURI = nil;
-  [MAPIApp setUserContext: nil];

  return mapistoreURI;
 }
@@ -41,8 +41,10 @@

 /* synchronisation */
 - (BOOL) synchroniseCache;
+- (BOOL) synchroniseCacheFor: (NSString *) nameInContainer;
 - (void) updateVersionsForMessageWithKey: (NSString *) messageKey
-                           withChangeKey: (NSData *) newChangeKey;
+                           withChangeKey: (NSData *) oldChangeKey
+                andPredecessorChangeList: (NSData *) pcl;
 - (NSNumber *) lastModifiedFromMessageChangeNumber: (NSString *) changeNumber;
 - (NSString *) changeNumberForMessageWithKey: (NSString *) messageKey;
 - (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey;
@@ -75,6 +75,7 @@ static Class NSNumberK;
          [SOGoMAPIDBMessage objectWithName: @"versions.plist"
                                inContainer: dbFolder]);
  [versionsMessage setObjectType: MAPIInternalCacheObject];
+  [versionsMessage reloadIfNeeded];
 }

 - (void) dealloc
@@ -85,9 +86,9 @@ static Class NSNumberK;
  [super dealloc];
 }

- (int) deleteFolder
+- (enum mapistore_error) deleteFolder
 {
-  int rc;
+  enum mapistore_error rc;
  NSException *error;
  NSString *name;

@@ -137,8 +138,8 @@ static Class NSNumberK;
    [sogoObject renameTo: newDisplayName];
 }

- (int) getPidTagDisplayName: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *displayName;
  Class cClass;
@@ -261,7 +262,6 @@ static Class NSNumberK;
 */
 - (void) _setChangeKey: (NSData *) changeKey
       forMessageEntry: (NSMutableDictionary *) messageEntry
-      inChangeListOnly: (BOOL) inChangeListOnly
 {
  struct XID *xid;
  NSString *guid;
@@ -270,19 +270,15 @@ static Class NSNumberK;
  NSMutableDictionary *changeList;

  xid = [changeKey asXIDInMemCtx: NULL];
-  guid = [NSString stringWithGUID: &xid->GUID];
-  globCnt = [NSData dataWithBytes: xid->Data length: xid->Size];
+  guid = [NSString stringWithGUID: &xid->NameSpaceGuid];
+  globCnt = [NSData dataWithBytes: xid->LocalId.data length: xid->LocalId.length];
  talloc_free (xid);

-  if (!inChangeListOnly)
-    {
-      /* 1. set change key association */
-      changeKeyDict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                      guid, @"GUID",
-                                    globCnt, @"LocalId",
-                                    nil];
-      [messageEntry setObject: changeKeyDict forKey: @"ChangeKey"];
-    }
+  /* 1. set change key association */
+  changeKeyDict = [NSDictionary dictionaryWithObjectsAndKeys: guid, @"GUID",
+                                globCnt, @"LocalId",
+                                nil];
+  [messageEntry setObject: changeKeyDict forKey: @"ChangeKey"];

  /* 2. append/update predecessor change list */
  changeList = [messageEntry objectForKey: @"PredecessorChangeList"];
@@ -296,6 +292,77 @@ static Class NSNumberK;
  [changeList setObject: globCnt forKey: guid];
 }

+- (void) _updatePredecessorChangeList: (NSData *) predecessorChangeList
+                      forMessageEntry: (NSMutableDictionary *) messageEntry
+                     withOldChangeKey: (NSData *) oldChangeKey
+{
+  NSData *globCnt, *oldGlobCnt;
+  NSDictionary *changeKeyDict;
+  NSString *guid;
+  NSMutableDictionary *changeList;
+  struct SizedXid *sizedXIDList;
+  struct XID xid, *givenChangeKey;
+  TALLOC_CTX *localMemCtx;
+  uint32_t i, length;
+
+  localMemCtx = talloc_new (NULL);
+  if (!localMemCtx)
+    {
+      [self errorWithFormat: @"No more memory"];
+      return;
+    }
+
+  if (predecessorChangeList)
+    {
+      sizedXIDList = [predecessorChangeList asSizedXidArrayInMemCtx: localMemCtx with: &length];
+
+      changeList = [messageEntry objectForKey: @"PredecessorChangeList"];
+      if (!changeList)
+        {
+          changeList = [NSMutableDictionary new];
+          [messageEntry setObject: changeList
+                           forKey: @"PredecessorChangeList"];
+          [changeList release];
+        }
+
+      if (sizedXIDList) {
+        for (i = 0; i < length; i++)
+          {
+            xid = sizedXIDList[i].XID;
+            guid = [NSString stringWithGUID: &xid.NameSpaceGuid];
+            globCnt = [NSData dataWithBytes: xid.LocalId.data length: xid.LocalId.length];
+            oldGlobCnt = [changeList objectForKey: guid];
+            if (!oldGlobCnt || ([globCnt compare: oldGlobCnt] == NSOrderedDescending))
+              [changeList setObject: globCnt forKey: guid];
+          }
+      }
+    }
+
+  if (oldChangeKey)
+    {
+      givenChangeKey = [oldChangeKey asXIDInMemCtx: localMemCtx];
+      if (givenChangeKey) {
+        guid = [NSString stringWithGUID: &givenChangeKey->NameSpaceGuid];
+        globCnt = [NSData dataWithBytes: givenChangeKey->LocalId.data length: givenChangeKey->LocalId.length];
+
+        changeKeyDict = [messageEntry objectForKey: @"ChangeKey"];
+        if (!changeKeyDict ||
+            ([guid isEqualToString: [changeKeyDict objectForKey: @"GUID"]]
+             && ([globCnt compare: [changeKeyDict objectForKey: @"LocalId"]] == NSOrderedDescending)))
+          {
+            /* The given change key is greater than current one stored in
+               metadata or it does not exist */
+            [messageEntry setObject: [NSDictionary dictionaryWithObjectsAndKeys: guid, @"GUID",
+                                                   globCnt, @"LocalId",
+                                                   nil]
+                             forKey: @"ChangeKey"];
+          }
+      }
+    }
+
+  talloc_free (localMemCtx);
+}
+
 - (EOQualifier *) componentQualifier
 {
  if (!componentQualifier)
@@ -465,8 +532,7 @@ static Class NSNumberK;
 	      // A GLOBCNT structure is a 6-byte global namespace counter,
 	      // we strip the first 2 bytes. The first two bytes is the ReplicaId
              changeKey = [self getReplicaKeyFromGlobCnt: newChangeNum >> 16];
-              [self _setChangeKey: changeKey forMessageEntry: messageEntry
-                 inChangeListOnly: NO];
+              [self _setChangeKey: changeKey forMessageEntry: messageEntry];
            }

          now = [NSCalendarDate date];
@@ -482,13 +548,123 @@ static Class NSNumberK;
  return rc;
 }

+- (BOOL) synchroniseCacheFor: (NSString *) nameInContainer
+{
+  /* Try to synchronise old messages in versions.plist cache using an
+     specific c_name. It returns a boolean indicating if the
+     synchronisation was carried out succesfully.
+
+     It should be used as last resort, keeping synchroniseCache as the
+     main sync entry point. */
+
+  uint64_t changeNumber;
+  NSString *changeNumberStr;
+  NSData *changeKey;
+  NSNumber *cLastModified, *cDeleted, *cVersion;
+  EOFetchSpecification *fs;
+  EOQualifier *searchQualifier, *fetchQualifier;
+  NSArray *fetchResults;
+  NSDictionary *result;
+  NSMutableDictionary *currentProperties, *messages, *mapping, *messageEntry;
+  GCSFolder *ocsFolder;
+  static NSArray *fields;
+
+  [versionsMessage reloadIfNeeded];
+  currentProperties = [versionsMessage properties];
+
+  messages = [currentProperties objectForKey: @"Messages"];
+  if (!messages)
+    {
+        messages = [NSMutableDictionary new];
+        [currentProperties setObject: messages forKey: @"Messages"];
+        [messages release];
+    }
+
+  messageEntry = [messages objectForKey: nameInContainer];
+  if (!messageEntry)
+    {
+      /* Fetch the message by its name */
+      if (!fields)
+        fields = [[NSArray alloc]
+                  initWithObjects: @"c_name", @"c_version", @"c_lastmodified",
+                  @"c_deleted", nil];
+
+      searchQualifier = [[EOKeyValueQualifier alloc] initWithKey: @"c_name"
+                                     operatorSelector: EOQualifierOperatorEqual
+                                                value: nameInContainer];
+      fetchQualifier = [[EOAndQualifier alloc]
+                        initWithQualifiers: searchQualifier,
+                        [self contentComponentQualifier],
+                        nil];
+      [fetchQualifier autorelease];
+      [searchQualifier release];
+
+      ocsFolder = [sogoObject ocsFolder];
+      fs = [EOFetchSpecification
+            fetchSpecificationWithEntityName: [ocsFolder folderName]
+                                   qualifier: fetchQualifier
+                               sortOrderings: nil];
+      fetchResults = [ocsFolder fetchFields: fields
+                         fetchSpecification: fs
+                              ignoreDeleted: NO];
+
+      if ([fetchResults count] == 1)
+        {
+          result = [fetchResults objectAtIndex: 0];
+          cLastModified = [result objectForKey: @"c_lastmodified"];
+          cDeleted = [result objectForKey: @"c_deleted"];
+          if ([cDeleted isKindOfClass: NSNumberK] && [cDeleted intValue])
+            cVersion = [NSNumber numberWithInt: -1];
+          else
+            cVersion = [result objectForKey: @"c_version"];
+
+          changeNumber = [[self context] getNewChangeNumber];
+          changeNumberStr = [NSString stringWithUnsignedLongLong: changeNumber];
+
+          /* Create new message entry in Messages dict */
+          messageEntry = [NSMutableDictionary new];
+          [messages setObject: messageEntry forKey: nameInContainer];
+          [messageEntry release];
+
+          /* Store cLastModified, cVersion and the change number */
+          [messageEntry setObject: cLastModified forKey: @"c_lastmodified"];
+          [messageEntry setObject: cVersion forKey: @"c_version"];
+          [messageEntry setObject: changeNumberStr forKey: @"version"];
+
+          /* Store the change key */
+          changeKey = [self getReplicaKeyFromGlobCnt: changeNumber >> 16];
+          [self _setChangeKey: changeKey forMessageEntry: messageEntry];
+
+          /* Store the changeNumber -> cLastModified mapping */
+          mapping = [currentProperties objectForKey: @"VersionMapping"];
+          if (!mapping)
+            {
+              mapping = [NSMutableDictionary new];
+              [currentProperties setObject: mapping forKey: @"VersionMapping"];
+              [mapping release];
+            }
+          [mapping setObject: cLastModified forKey: changeNumberStr];
+
+          /* Save the message */
+          [versionsMessage save];
+          return YES;
+        }
+      else
+          return NO;
+    }
+
+  /* If message entry exists, then synchroniseCache did its job */
+  return YES;
+}
+
 - (void) updateVersionsForMessageWithKey: (NSString *) messageKey
-                           withChangeKey: (NSData *) newChangeKey
+                           withChangeKey: (NSData *) oldChangeKey
+                andPredecessorChangeList: (NSData *) pcl
 {
  NSMutableDictionary *messages, *messageEntry;

  [self synchroniseCache];
-  if (newChangeKey)
+  if (oldChangeKey || pcl)
    {
      messages = [[versionsMessage properties] objectForKey: @"Messages"];
      messageEntry = [messages objectForKey: messageKey];
@@ -496,8 +672,8 @@ static Class NSNumberK;
        [NSException raise: @"MAPIStoreIOException"
                    format: @"no version record found for message '%@'",
                     messageKey];
-      [self _setChangeKey: newChangeKey forMessageEntry: messageEntry
-         inChangeListOnly: YES];
+      [self _updatePredecessorChangeList: pcl forMessageEntry: messageEntry
+                        withOldChangeKey: oldChangeKey];
      [versionsMessage save];
    }
 }
@@ -505,12 +681,12 @@ static Class NSNumberK;
 - (NSNumber *) lastModifiedFromMessageChangeNumber: (NSString *) changeNumber
 {
  NSDictionary *mapping;
-  NSNumber *modseq;
+  NSNumber *lastModified;

  mapping = [[versionsMessage properties] objectForKey: @"VersionMapping"];
-  modseq = [mapping objectForKey: changeNumber];
+  lastModified = [mapping objectForKey: changeNumber];

-  return modseq;
+  return lastModified;
 }

 - (NSString *) changeNumberForMessageWithKey: (NSString *) messageKey
@@ -683,6 +859,7 @@ static Class NSNumberK;
      woContext = [[self userContext] woContext];
      activeUserRoles = [activeUser rolesForObject: sogoObject
                                         inContext: woContext];
+      activeUserRoles = [self expandRoles: activeUserRoles];
      [activeUserRoles retain];
    }

@@ -23,6 +23,8 @@
 #ifndef MAPISTOREGCSMESSAGE_H
 #define MAPISTOREGCSMESSAGE_H

+#import <SOGo/SOGoUser.h>
+
 #import "MAPIStoreMessage.h"

@interface MAPIStoreGCSMessage : MAPIStoreMessage
@@ -30,6 +32,11 @@
 }

 /* subclass helpers */
+
+/* Return the message original creator */
+- (NSString *) creator;
+- (NSString *) owner;
+- (SOGoUser *) ownerUser;
 - (void) updateVersions;

@end
@@ -20,10 +20,12 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSValue.h>
 #import <NGObjWeb/SoSecurityManager.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
 #import <SOGo/SOGoContentObject.h>
@@ -35,6 +37,7 @@
 #import "MAPIStoreTypes.h"
 #import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
+#import "NSString+MAPIStore.h"

 #import "MAPIStoreGCSMessage.h"

@@ -54,76 +57,28 @@
  return [sogoObject lastModified];
 }

- (int) getPidTagAccess: (void **) data // TODO
-               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagCreatorName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
-  MAPIStoreContext *context;
-  WOContext *woContext;
-  SoSecurityManager *sm;
-  MAPIStoreUserContext *userContext;
-  uint32_t access;
+  enum mapistore_error rc;
+  NSString *creator;

-  context = [self context];
-  userContext = [self userContext];
-  if ([[context activeUser] isEqual: [userContext sogoUser]])
-    access = 0x03;
-  else
+  creator = [self creator];
+  if (creator)
    {
-      sm = [SoSecurityManager sharedSecurityManager];
-      woContext = [userContext woContext];
-
-      access = 0;
-      if (![sm validatePermission: SoPerm_ChangeImagesAndFiles
-                         onObject: sogoObject
-                        inContext: woContext])
-        access |= 1;
-      if (![sm validatePermission: SoPerm_AccessContentsInformation
-                         onObject: sogoObject
-                        inContext: woContext])
-        access |= 2;
-      if (![sm validatePermission: SOGoPerm_DeleteObject
-                         onObject: sogoObject
-                        inContext: woContext])
-        access |= 4;
+      *data = [creator asUnicodeInMemCtx: memCtx];
+      rc = MAPISTORE_SUCCESS;
    }
-  *data = MAPILongValue (memCtx, access);
+  else
+    rc = MAPISTORE_ERR_NOT_FOUND;

-  return MAPISTORE_SUCCESS;
+  return rc;
 }

- (int) getPidTagAccessLevel: (void **) data // TODO
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagChangeKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
-  MAPIStoreContext *context;
-  MAPIStoreUserContext *userContext;
-  WOContext *woContext;
-  SoSecurityManager *sm;
-  uint32_t accessLvl;
-
-  context = [self context];
-  userContext = [self userContext];
-  if ([[context activeUser] isEqual: [userContext sogoUser]])
-    accessLvl = 1;
-  else
-    {
-      sm = [SoSecurityManager sharedSecurityManager];
-      woContext = [userContext woContext];
-      if (![sm validatePermission: SoPerm_ChangeImagesAndFiles
-                         onObject: sogoObject
-                        inContext: woContext])
-        accessLvl = 1;
-      else
-        accessLvl = 0;
-    }
-  *data = MAPILongValue (memCtx, accessLvl);
-
-  return MAPISTORE_SUCCESS;
-}
-
- (int) getPidTagChangeKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
-{
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSData *changeKey;
  MAPIStoreGCSFolder *parentFolder;
  NSString *nameInContainer;
@@ -140,18 +95,25 @@
          [parentFolder synchroniseCache];
          changeKey = [parentFolder changeKeyForMessageWithKey: nameInContainer];
        }
-      if (!changeKey)
-        abort ();
-      *data = [changeKey asBinaryInMemCtx: memCtx];
+      if (changeKey)
+        *data = [changeKey asBinaryInMemCtx: memCtx];
+      else
+        {
+          [self warnWithFormat: @"No change key for %@ in folder %@",
+                nameInContainer,
+                [parentFolder url]
+           ];
+          rc = MAPISTORE_ERR_NOT_FOUND;
+        }
    }

  return rc;
 }

- (int) getPidTagPredecessorChangeList: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagPredecessorChangeList: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSData *changeList;
  MAPIStoreGCSFolder *parentFolder;

@@ -180,7 +142,8 @@
 {
  uint64_t version = ULLONG_MAX;
  NSString *changeNumber;
- 
+  BOOL synced;
+
  if (!isNew)
    {
      changeNumber = [(MAPIStoreGCSFolder *) container
@@ -189,16 +152,28 @@
        {
          [self warnWithFormat: @"attempting to get change number"
                @" by synchronising folder..."];
-          [(MAPIStoreGCSFolder *) container synchroniseCache];
-          changeNumber = [(MAPIStoreGCSFolder *) container
-                            changeNumberForMessageWithKey: [self nameInContainer]];
-          
-          if (changeNumber)
-            [self logWithFormat: @"got one"];
-          else
+          synced = [(MAPIStoreGCSFolder *) container synchroniseCache];
+          if (synced)
            {
-              [self errorWithFormat: @"still nothing. We crash!"];
-              abort();
+              changeNumber = [(MAPIStoreGCSFolder *) container
+                                changeNumberForMessageWithKey: [self nameInContainer]];
+            }
+          if (!changeNumber)
+            {
+              [self warnWithFormat: @"attempting to get change number"
+                    @" by synchronising this specific message..."];
+              synced = [(MAPIStoreGCSFolder *) container
+                        synchroniseCacheFor: [self nameInContainer]];
+              if (synced)
+                {
+                  changeNumber = [(MAPIStoreGCSFolder *) container
+                                  changeNumberForMessageWithKey: [self nameInContainer]];
+                }
+              if (!changeNumber)
+                {
+                  [self errorWithFormat: @"still nothing. We crash!"];
+                  abort();
+                }
            }
        }
      version = [changeNumber unsignedLongLongValue] >> 16;
@@ -209,13 +184,81 @@

 - (void) updateVersions
 {
-  NSData *newChangeKey;
+  /* Update ChangeKey and PredecessorChangeList on message's save */
+  NSData *newChangeKey, *predecessorChangeList;

  newChangeKey = [properties objectForKey: MAPIPropertyKey (PR_CHANGE_KEY)];
+  predecessorChangeList = [properties objectForKey: MAPIPropertyKey (PR_PREDECESSOR_CHANGE_LIST)];

  [(MAPIStoreGCSFolder *) container
-    updateVersionsForMessageWithKey: [self nameInContainer]
-                      withChangeKey: newChangeKey];
+      updateVersionsForMessageWithKey: [self nameInContainer]
+                        withChangeKey: newChangeKey
+             andPredecessorChangeList: predecessorChangeList];
+}
+
+//----------------------
+// Sharing
+//----------------------
+
+- (NSString *) creator
+{
+  return [self owner];
+}
+
+- (NSString *) owner
+{
+  return [sogoObject ownerInContext: nil];
+}
+
+- (SOGoUser *) ownerUser
+{
+  NSString *ownerName;
+  SOGoUser *owner = nil;
+
+  ownerName = [self owner];
+  if ([ownerName length] != 0)
+    owner = [SOGoUser userWithLogin: ownerName];
+
+  return owner;
+}
+
+- (BOOL) subscriberCanModifyMessage
+{
+  BOOL rc;
+  NSArray *roles;
+
+  roles = [self activeUserRoles];
+
+  if (isNew)
+    rc = [roles containsObject: SOGoRole_ObjectCreator];
+  else
+    rc = [roles containsObject: SOGoRole_ObjectEditor];
+
+  /* Check if the message is owned and it has permission to edit it */
+  if (!rc && [roles containsObject: MAPIStoreRightEditOwn])
+    rc = [[[container context] activeUser] isEqual: [self ownerUser]];
+
+  return rc;
+}
+
+- (BOOL) subscriberCanDeleteMessage
+{
+  BOOL rc;
+  NSArray *roles;
+
+  roles = [self activeUserRoles];
+  rc = [roles containsObject: SOGoRole_ObjectEraser];
+
+  /* Check if the message is owned and it has permission to delete it */
+  if (!rc && [roles containsObject: MAPIStoreRightDeleteOwn])
+    {
+      NSString *currentUser;
+
+      currentUser = [[container context] activeUser];
+      rc = [currentUser isEqual: [self ownerUser]];
+    }
+
+  return rc;
 }

@end
@@ -27,6 +27,7 @@
 #import <Foundation/NSString.h>

 #import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSObject+Values.h>

 #import <EOControl/EOFetchSpecification.h>
 #import <EOControl/EOQualifier.h>
@@ -38,7 +39,6 @@

 #import "MAPIStoreTypes.h"
 #import "MAPIStoreGCSFolder.h"
-
 #import "MAPIStoreGCSMessageTable.h"

 #undef DEBUG
@@ -89,21 +89,31 @@

  if (res->ulPropTag == PidTagChangeNumber)
    {
+      NSString *changeNumber;
+
      value = NSObjectFromMAPISPropValue (&res->lpProp);
+      changeNumber = [NSString stringWithUnsignedLongLong: [(NSNumber *)value unsignedLongLongValue]];
      lastModified = [(MAPIStoreGCSFolder *)
-                       container lastModifiedFromMessageChangeNumber: value];
+                       container lastModifiedFromMessageChangeNumber: changeNumber];
      //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
      //[self logWithFormat: @"  c_lastmodified: %@", lastModified];
      if (lastModified)
        {
+          SEL operator;
+
+          operator = [self operatorFromRestrictionOperator: res->relop];
          *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"c_lastmodified"
-                                               operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
+                                               operatorSelector: operator
                                                          value: lastModified];
          [*qualifier autorelease];
          rc = MAPIRestrictionStateNeedsEval;
        }
      else
-        rc = MAPIRestrictionStateAlwaysTrue;
+        {
+          [self logWithFormat: @"No last modified found for: 0x%.16"PRIx64". Then no restriction applied",
+                [value unsignedLongLongValue]];
+          rc = MAPIRestrictionStateAlwaysTrue;
+        }
    }
  else
    {
@@ -30,6 +30,7 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <Mailer/SOGoMailBodyPart.h>
 #import <Mailer/SOGoMailObject.h>
+#import <Mailer/NSDictionary+Mail.h>

 #import "MAPIStoreTypes.h"
 #import "MAPIStoreMailMessage.h"
@@ -75,24 +76,24 @@
  ASSIGN (bodyPart, newBodyPart);
 }

- (int) getPidTagAttachMethod: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachMethod: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0x00000001); // afByValue

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachTag: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachTag: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self mimeAttachTag] asBinaryInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachSize: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachSize: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t longValue;

@@ -102,13 +103,13 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagRecordKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagRecordKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  static char recordBytes[] = {0xd9, 0xd8, 0x11, 0xa3, 0xe2, 0x90, 0x18, 0x41,
                               0x9e, 0x04, 0x58, 0x46, 0x9d, 0x6d, 0x1b,
                               0x68};
-  
+
  *data = [[NSData dataWithBytes: recordBytes length: 16]
            asBinaryInMemCtx: memCtx];

@@ -117,31 +118,19 @@

 - (NSString *) _fileName
 {
-  NSString *fileName;
-  NSDictionary *parameters;
-
-  fileName = [[bodyInfo objectForKey: @"parameterList"]
-               objectForKey: @"name"];
-  if (!fileName)
-    {
-      parameters = [[bodyInfo objectForKey: @"disposition"]
-                     objectForKey: @"parameterList"];
-      fileName = [parameters objectForKey: @"filename"];
-    }
-
-  return fileName;
+  return [bodyInfo filename];
 }

- (int) getPidTagAttachLongFilename: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachLongFilename: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self _fileName] asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachFilename: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachFilename: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *fileName, *baseName, *ext;

@@ -160,8 +149,8 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagDisplayName: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *fileName;

@@ -176,17 +165,17 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachContentId: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
-{ 
+- (enum mapistore_error) getPidTagAttachContentId: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
+{
  *data = [[bodyInfo objectForKey: @"bodyId"]
            asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachMimeTag: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachMimeTag: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *mimeTag, *fileName;

@@ -204,8 +193,8 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAttachDataBinary: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAttachDataBinary: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[bodyPart fetchBLOBWithPeek: YES] asBinaryInMemCtx: memCtx];

@@ -67,7 +67,7 @@ MakeDisplayFolderName (NSString *folderName)
  NSArray *parts;
  NSString *lastFolder;
  NSUInteger max;
- 
+
  parts = [folderName componentsSeparatedByString: @"/"];
  max = [parts count];
  if (max > 1)
@@ -160,23 +160,25 @@ MakeDisplayFolderName (NSString *folderName)
  for (count = 0; count < max; count++)
    {
      context = talloc_zero (memCtx, struct mapistore_contexts_list);
-      // secondaryFolders has the names (1) Imap4Encoded and (2) asCSSIdentifier
-      //     e.g.: Probl&AOg-mes_SP_de_SP_synchronisation
+      // secondaryFolders has the names (1) Imap4Encoded ,(2) asCSSIdentifier and (3) "folder"-prefixed
+      //     e.g.: folderProbl&AOg-mes_SP_de_SP_synchronisation
      currentName = [secondaryFolders objectAtIndex: count];
-      // To get the real name we have to revert that (applying the decode functions)
-      // in reverse order
+      // To get the real name we have to revert that (applying the decode functions
+      // in reverse order)
      //     e.g.: Problèmes de synchronisation
-      realName = [[currentName fromCSSIdentifier]
-                               stringByDecodingImap4FolderName];
+      realName = [[[currentName substringFromIndex: 6]
+                                fromCSSIdentifier]
+                                stringByDecodingImap4FolderName];
      // And finally to represent that as URI we have to (1) asCSSIdentifier,
-      // (2) Imap4Encode and (3) AddPercentEscapes
-      //     e.g.: Probl&AOg-mes_SP_de_SP_synchronisation
+      // (2) Imap4Encode (3) AddPercentEscapes and (4) add the "folder" prefix
+      //     e.g.: folderProbl&AOg-mes_SP_de_SP_synchronisation
      // In the example there are no percent escapes added because is already ok
      stringData = [[[realName asCSSIdentifier]
                               stringByEncodingImap4FolderName]
                               stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+      stringData = [NSString stringWithFormat: @"folder%@", stringData];
      context->url = [[NSString stringWithFormat: @"%@%@", urlBase, stringData] asUnicodeInMemCtx: context];
-      context->name = [[realName substringFromIndex: 6] asUnicodeInMemCtx: context];
+      context->name = [realName asUnicodeInMemCtx: context];
      context->main_folder = false;
      context->role = MAPISTORE_MAIL_ROLE;
      context->tag = "tag";
@@ -198,10 +200,9 @@ MakeDisplayFolderName (NSString *folderName)

  userContext = [MAPIStoreUserContext userContextWithUsername: userName
                                               andTDBIndexing: NULL];
-  [MAPIApp setUserContext: userContext];
  accountFolder = [[userContext rootFolders] objectForKey: @"mail"];
  folderName = [NSString stringWithFormat: @"folder%@",
-                         [newFolderName asCSSIdentifier]];
+                         [[newFolderName stringByEncodingImap4FolderName] asCSSIdentifier]];
  newFolder = [SOGoMailFolder objectWithName: folderName
                                 inContainer: accountFolder];
  if ([newFolder create])
@@ -210,10 +211,9 @@ MakeDisplayFolderName (NSString *folderName)
                                       withString: @"%40"],
                             [userName stringByReplacingOccurrencesOfString: @"@"
                                       withString: @"%40"],
-                             [[folderName stringByEncodingImap4FolderName] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+                             [folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
  else
    mapistoreURI = nil;
-  [MAPIApp setUserContext: nil];

  return mapistoreURI;
 }
@@ -52,6 +52,8 @@
 - (NSString *) changeNumberForMessageUID: (NSString *) messageUid;
 - (void) setChangeKey: (NSData *) changeKey
    forMessageWithKey: (NSString *) messageKey;
+- (BOOL) updatePredecessorChangeListWith: (NSData *) changeKey
+                       forMessageWithKey: (NSString *) messageKey;
 - (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey;
 - (NSData *) predecessorChangeListForMessageWithKey: (NSString *) messageKey;

@@ -68,10 +68,13 @@

 static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;

+#include <gen_ndr/exchange.h>
+
 #undef DEBUG
 #include <util/attr.h>
 #include <libmapi/libmapi.h>
 #include <libmapiproxy.h>
+#include <limits.h>
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>

@@ -109,6 +112,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
          [SOGoMAPIDBMessage objectWithName: @"versions.plist"
                                inContainer: dbFolder]);
  [versionsMessage setObjectType: MAPIInternalCacheObject];
+  [versionsMessage reloadIfNeeded];
 }

 - (BOOL) ensureFolderExists
@@ -139,7 +143,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
      [[self mapping] updateID: fid withURL: [self url]];
      [dbFolder setNameInContainer: newNameInContainer];
      [self cleanupCaches];
-      
+
      propsCopy = [newProperties mutableCopy];
      [propsCopy removeObjectForKey: key];
      [propsCopy autorelease];
@@ -178,7 +182,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
      if (aRow->lpProps[i].ulPropTag == PR_DISPLAY_NAME_UNICODE)
        folderName = [NSString stringWithUTF8String: aRow->lpProps[i].value.lpszW];
      else if (aRow->lpProps[i].ulPropTag == PR_DISPLAY_NAME)
-        folderName = [NSString stringWithUTF8String: aRow->lpProps[i].value.lpszA];
+        folderName = [NSString stringWithUTF8String: (const char *) aRow->lpProps[i].value.lpszA];
    }

  if (folderName)
@@ -186,10 +190,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
      nameInContainer = [NSString stringWithFormat: @"folder%@",
                                  [[folderName stringByEncodingImap4FolderName] asCSSIdentifier]];

-      /* it may be the operation is interleaved with operations
-         from other users having cached information in the thread
-         with the other user, so it'd better activate the user again here... */
-      [[self userContext] activateWithUser: [[[self userContext] woContext] activeUser]];
+      [[self userContext] activate];

      newFolder = [SOGoMailFolderK objectWithName: nameInContainer
                                      inContainer: sogoObject];
@@ -207,9 +208,9 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
  return rc;
 }

- (int) deleteFolder
+- (enum mapistore_error) deleteFolder
 {
-  int rc;
+  enum mapistore_error rc;
  NSException *error;
  NSString *name;

@@ -233,8 +234,8 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
  return (rc == MAPISTORE_SUCCESS) ? [super deleteFolder] : rc;
 }

- (int) getPidTagContentUnreadCount: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagContentUnreadCount: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  EOQualifier *searchQualifier;
  uint32_t longValue;
@@ -245,18 +246,79 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
                                         sortOrdering: nil]
                count];
  *data = MAPILongValue (memCtx, longValue);
-  
+
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagContainerClass: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagContainerClass: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPF.Note" asUnicodeInMemCtx: memCtx];
-  
+
  return MAPISTORE_SUCCESS;
 }

+- (EOQualifier *) simplifyQualifier: (EOQualifier *) qualifier
+{
+  /* Hack: Reduce the number of MODSEQ constraints to a single one as
+     we assume the difference among MODSEQs will be small enough to
+     return a small number of UIDs.
+
+     This is the only case we do simplify:
+     MODSEQ >= x | MODSEQ >= y | MODSEQ >= z => MODSEQ >= min(x,y,z)
+  */
+  if (qualifier && [qualifier isKindOfClass: [EOOrQualifier class]])
+    {
+      EOQualifier *simplifiedQualifier;
+      NSArray  *quals;
+      NSNumber *minModseq;
+      NSUInteger i, count;
+
+      quals = [(EOOrQualifier *)qualifier qualifiers];
+      count = [quals count];
+      if (count < 2)
+        return qualifier;
+
+      minModseq = [NSNumber numberWithUnsignedLongLong: ULLONG_MAX];
+
+      for (i = 0; i < count; i++)
+        {
+          EOQualifier *subQualifier;
+
+          subQualifier = [quals objectAtIndex: i];
+          if ([subQualifier isKindOfClass: [EOAndQualifier class]]
+              && [[(EOAndQualifier *)subQualifier qualifiers] count] == 1)
+            subQualifier = [[(EOAndQualifier *)subQualifier qualifiers] objectAtIndex: 0];
+
+          if ([subQualifier isKindOfClass: [EOKeyValueQualifier class]]
+              && [[(EOKeyValueQualifier *)subQualifier key] isEqualToString: @"MODSEQ"])
+            {
+              NSNumber *value;
+
+              value = (NSNumber *)[(EOKeyValueQualifier *)subQualifier value];
+              if ([minModseq compare: value] == NSOrderedDescending
+                  && [value unsignedLongLongValue] > 0)
+                minModseq = (NSNumber *)[(EOKeyValueQualifier *)subQualifier value];
+
+            }
+          else
+            return qualifier;
+        }
+
+      if ([minModseq unsignedLongLongValue] > 0 && [minModseq unsignedLongLongValue] < ULLONG_MAX)
+        {
+          simplifiedQualifier = [[EOKeyValueQualifier alloc]
+                                       initWithKey: @"MODSEQ"
+                                  operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
+                                             value: minModseq];
+          [simplifiedQualifier autorelease];
+          return simplifiedQualifier;
+        }
+    }
+
+  return qualifier;
+}
+
 - (EOQualifier *) nonDeletedQualifier
 {
  static EOQualifier *nonDeletedQualifier = nil;
@@ -265,7 +327,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
  if (!nonDeletedQualifier)
    {
      deletedQualifier
-        = [[EOKeyValueQualifier alloc] 
+        = [[EOKeyValueQualifier alloc]
                 initWithKey: @"FLAGS"
            operatorSelector: EOQualifierOperatorContains
                       value: [NSArray arrayWithObject: @"Deleted"]];
@@ -281,7 +343,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
                          andSortOrderings: (NSArray *) sortOrderings
 {
  NSArray *uidKeys;
-  EOQualifier *fetchQualifier;
+  EOQualifier *fetchQualifier, *simplifiedQualifier;

  if ([self ensureFolderExists])
    {
@@ -290,9 +352,10 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;

      if (qualifier)
        {
+          simplifiedQualifier = [self simplifyQualifier: qualifier];
          fetchQualifier
            = [[EOAndQualifier alloc] initWithQualifiers:
-                                        [self nonDeletedQualifier], qualifier,
+                                        [self nonDeletedQualifier], simplifiedQualifier,
                                      nil];
          [fetchQualifier autorelease];
        }
@@ -378,7 +441,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
        [self warnWithFormat: @"qualifier is only used for folders with name"];
      if (sortOrderings)
        [self errorWithFormat: @"sort orderings are not used for folders"];
-      
+
      /* FIXME: Flush any cache before retrieving the hierarchy, this
         slows things down but it is safer */
      if (!qualifier)
@@ -472,7 +535,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
    }
  else
    supportsSubFolders = YES;
-  
+
  return supportsSubFolders;
 }

@@ -519,6 +582,44 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
  return [modseq1 compare: modseq2];
 }

+- (void) _updatePredecessorChangeListWith: (NSData *) predecessorChangeList
+                          forMessageEntry: (NSMutableDictionary *) messageEntry
+{
+  NSData *globCnt, *oldGlobCnt;
+  NSMutableDictionary *changeList;
+  NSString *guid;
+  struct SizedXid *sizedXIDList;
+  struct XID xid;
+  uint32_t i, length;
+
+  sizedXIDList = [predecessorChangeList asSizedXidArrayInMemCtx: NULL with: &length];
+
+  changeList = [messageEntry objectForKey: @"PredecessorChangeList"];
+  if (!changeList)
+    {
+      changeList = [NSMutableDictionary new];
+      [messageEntry setObject: changeList
+                    forKey: @"PredecessorChangeList"];
+      [changeList release];
+    }
+
+  if (sizedXIDList) {
+    for (i = 0; i < length; i++)
+      {
+        xid = sizedXIDList[i].XID;
+        guid = [NSString stringWithGUID: &xid.NameSpaceGuid];
+        globCnt = [NSData dataWithBytes: xid.LocalId.data length: xid.LocalId.length];
+        oldGlobCnt = [changeList objectForKey: guid];
+        if (!oldGlobCnt || ([globCnt compare: oldGlobCnt] == NSOrderedDescending))
+          [changeList setObject: globCnt forKey: guid];
+      }
+
+    talloc_free (sizedXIDList);
+  }
+
+  [versionsMessage save];
+}
+
 - (void) _setChangeKey: (NSData *) changeKey
       forMessageEntry: (NSMutableDictionary *) messageEntry
 {
@@ -529,8 +630,8 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
  NSMutableDictionary *changeList;

  xid = [changeKey asXIDInMemCtx: NULL];
-  guid = [NSString stringWithGUID: &xid->GUID];
-  globCnt = [NSData dataWithBytes: xid->Data length: xid->Size];
+  guid = [NSString stringWithGUID: &xid->NameSpaceGuid];
+  globCnt = [NSData dataWithBytes: xid->LocalId.data length: xid->LocalId.length];
  talloc_free (xid);

  /* 1. set change key association */
@@ -556,13 +657,12 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
 {
  BOOL rc = YES;
  uint64_t newChangeNum;
-  NSNumber *ti, *modseq, *initialLastModseq, *lastModseq,
-    *nextModseq;
+  NSNumber *ti, *modseq, *lastModseq, *nextModseq;
  NSString *changeNumber, *uid, *messageKey;
  uint64_t lastModseqNbr;
  EOQualifier *searchQualifier;
  NSArray *uids, *changeNumbers;
-  NSUInteger count, max;
+  NSUInteger count, max, nFetched;
  NSArray *fetchResults;
  NSDictionary *result;
  NSData *changeKey;
@@ -596,7 +696,6 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
    }

  lastModseq = [currentProperties objectForKey: @"SyncLastModseq"];
-  initialLastModseq = lastModseq;
  if (lastModseq)
    {
      lastModseqNbr = [lastModseq unsignedLongLongValue];
@@ -641,7 +740,14 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
      fetchResults
        = [fetchResults sortedArrayUsingFunction: _compareFetchResultsByMODSEQ
                                         context: NULL];
-      
+
+      nFetched = [fetchResults count];
+      if (nFetched != max) {
+        [self errorWithFormat: @"Error fetching UIDs. Asked: %d Received: %d."
+              @"Check the IMAP conversation for details", max, nFetched];
+        return NO;
+      }
+
      for (count = 0; count < max; count++)
        {
          result = [fetchResults objectAtIndex: count];
@@ -680,40 +786,37 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
    }

  /* 2. we synchronise expunged UIDs */
-  if (initialLastModseq)
+  fetchResults = [(SOGoMailFolder *) sogoObject
+                     fetchUIDsOfVanishedItems: lastModseqNbr];
+
+  max = [fetchResults count];
+
+  changeNumber = nil;
+  for (count = 0; count < max; count++)
    {
-      fetchResults = [(SOGoMailFolder *) sogoObject
-                         fetchUIDsOfVanishedItems: lastModseqNbr];
-
-      max = [fetchResults count];
-
-      changeNumber = nil;
-      for (count = 0; count < max; count++)
+      uid = [[fetchResults objectAtIndex: count] stringValue];
+      if ([messages objectForKey: uid])
        {
-          uid = [[fetchResults objectAtIndex: count] stringValue];
-          if ([messages objectForKey: uid])
+          if (!changeNumber)
            {
-              if (!changeNumber)
-                {
-                  newChangeNum = [[self context] getNewChangeNumber];
-                  changeNumber = [NSString stringWithUnsignedLongLong: newChangeNum];
-                }
-              [messages removeObjectForKey: uid];
-              [self logWithFormat: @"Removed message entry for UID %@", uid];
-            }
-          else
-            {
-              [self logWithFormat:@"Message entry not found for UID %@", uid];
+              newChangeNum = [[self context] getNewChangeNumber];
+              changeNumber = [NSString stringWithUnsignedLongLong: newChangeNum];
            }
+          [messages removeObjectForKey: uid];
+          [self logWithFormat: @"Removed message entry for UID %@", uid];
        }
-      if (changeNumber)
+      else
        {
-          [currentProperties setObject: changeNumber
-                                forKey: @"SyncLastDeleteChangeNumber"];
-          [mapping setObject: lastModseq forKey: changeNumber];
-          foundChange = YES;
+          [self logWithFormat:@"Message entry not found for UID %@", uid];
        }
    }
+  if (changeNumber)
+    {
+      [currentProperties setObject: changeNumber
+                            forKey: @"SyncLastDeleteChangeNumber"];
+      [mapping setObject: lastModseq forKey: changeNumber];
+      foundChange = YES;
+    }

  if (foundChange)
    {
@@ -927,8 +1030,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
  return changeNumber;
 }

- (void) setChangeKey: (NSData *) changeKey
-    forMessageWithKey: (NSString *) messageKey
+- (NSMutableDictionary *) _messageEntryFromMessageKey: (NSString *) messageKey
 {
  NSMutableDictionary *messages, *messageEntry;
  NSString *messageUid;
@@ -939,7 +1041,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
  messageEntry = [messages objectForKey: messageUid];
  if (!messageEntry)
    {
-      [self warnWithFormat: @"attempting to synchronise to set the change key for "
+      [self warnWithFormat: @"attempting to synchronise to get the message entry for "
                            @"this message %@", messageKey];
      synced = [self synchroniseCacheForUID: messageUid];
      if (synced)
@@ -950,11 +1052,57 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
          abort ();
        }
    }
-  [self _setChangeKey: changeKey forMessageEntry: messageEntry];
-  
+
+  return messageEntry;
+}
+
+- (void) setChangeKey: (NSData *) changeKey
+    forMessageWithKey: (NSString *) messageKey
+{
+  [self _setChangeKey: changeKey
+      forMessageEntry: [self _messageEntryFromMessageKey: messageKey]];
+
  [versionsMessage save];
 }

+- (BOOL) updatePredecessorChangeListWith: (NSData *) changeKey
+                       forMessageWithKey: (NSString *) messageKey
+{
+  /* Update predecessor change list property given the change key. It
+     returns if the change key has been added to the list or not */
+  BOOL added = NO;
+  NSData *globCnt, *oldGlobCnt;
+  NSDictionary *messageEntry;
+  NSMutableDictionary *changeList;
+  NSString *guid;
+  struct XID *xid;
+
+  xid = [changeKey asXIDInMemCtx: NULL];
+  guid = [NSString stringWithGUID: &xid->NameSpaceGuid];
+  globCnt = [NSData dataWithBytes: xid->LocalId.data length: xid->LocalId.length];
+  talloc_free (xid);
+
+  messageEntry = [self _messageEntryFromMessageKey: messageKey];
+  if (messageEntry)
+    {
+      changeList = [messageEntry objectForKey: @"PredecessorChangeList"];
+      if (changeList)
+        {
+          oldGlobCnt = [changeList objectForKey: guid];
+          if (!oldGlobCnt || ([globCnt compare: oldGlobCnt] == NSOrderedDescending))
+            {
+              [changeList setObject: globCnt forKey: guid];
+              [versionsMessage save];
+              added = YES;
+            }
+        }
+      else
+        [self errorWithFormat: @"Missing predecessor change list to update"];
+    }
+
+  return added;
+}
+
 - (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey
 {
  NSDictionary *messages, *changeKeyDict;
@@ -1178,7 +1326,7 @@ _parseIMAPRange (const unichar *uniString, NSArray **UIDsP)
      count++;
    }
  *UIDsP = UIDs;
- 
+
  return count;
 }

@@ -1215,14 +1363,14 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
 // Move (or eventually copy) the mails identified by
 // "srcMids" from the source folder into this folder.
 //
- (int) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
-                        andCount: (uint32_t) midCount
-                      fromFolder: (MAPIStoreFolder *) sourceFolder
-                        withMIDs: (uint64_t *) targetMids
-                   andChangeKeys: (struct Binary_r **) targetChangeKeys
-                        wantCopy: (uint8_t) wantCopy
-                        inMemCtx: (TALLOC_CTX *) memCtx
-
+- (enum mapistore_error) moveCopyMessagesWithMIDs: (uint64_t *) srcMids
+                                         andCount: (uint32_t) midCount
+                                       fromFolder: (MAPIStoreFolder *) sourceFolder
+                                         withMIDs: (uint64_t *) targetMids
+                                    andChangeKeys: (struct Binary_r **) targetChangeKeys
+                        andPredecessorChangeLists: (struct Binary_r **) targetPredecessorChangeLists
+                                         wantCopy: (uint8_t) wantCopy
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  NGImap4Connection *connection;
  NGImap4Client *client;
@@ -1234,12 +1382,13 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
  NSDictionary *result;
  NSUInteger count;
  NSArray *a;
-  NSData *changeKey;
+  NSData *changeList;

  if (![sourceFolder isKindOfClass: [MAPIStoreMailFolder class]])
    return [super moveCopyMessagesWithMIDs: srcMids andCount: midCount
                                fromFolder: sourceFolder withMIDs: targetMids
                             andChangeKeys: targetChangeKeys
+                 andPredecessorChangeLists: targetPredecessorChangeLists
                                  wantCopy: wantCopy
                                  inMemCtx: memCtx];

@@ -1328,11 +1477,11 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
      [self synchroniseCache];
      for (count = 0; count < midCount; count++)
        {
-          changeKey = [NSData dataWithBinary: targetChangeKeys[count]];
+          changeList = [NSData dataWithBinary: targetPredecessorChangeLists[count]];
          messageKey = [NSString stringWithFormat: @"%@.eml",
                                 [destUIDs objectAtIndex: count]];
-          [self   setChangeKey: changeKey
-             forMessageWithKey: messageKey];
+          [self _updatePredecessorChangeListWith: changeList
+                                 forMessageEntry: [self _messageEntryFromMessageKey: messageKey]];
        }
    }

@@ -1456,7 +1605,7 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
                  [uids addObject: [self messageUIDFromMessageKey: childKey]];
                }

-              result = [client copyUids: uids 
+              result = [client copyUids: uids
                               toFolder: newFolderIMAPName];
              if ([[result objectForKey: @"result"] boolValue])
                {
@@ -1495,9 +1644,10 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
 {
  SOGoCacheObject *childObject;

-  childObject = [SOGoCacheObject objectWithName: [SOGoCacheObject
-                                                  globallyUniqueObjectId]
-                                   inContainer: sogoObject];
+  [[[self context] userContext] activate];
+
+  childObject = [SOGoCacheObject objectWithName: [SOGoCacheObject globallyUniqueObjectId]
+                                    inContainer: sogoObject];
  return [MAPIStoreMailVolatileMessage
           mapiStoreObjectWithSOGoObject: childObject
                             inContainer: self];
@@ -1506,7 +1656,7 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
 - (id) lookupMessage: (NSString *) messageKey
 {
  MAPIStoreMailMessage *message;
-  NSData *rawBodyData;
+  NSArray *rawBodyData;

  message = [super lookupMessage: messageKey];
  if (message)
@@ -1560,10 +1710,10 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
    rights |= RightsCreateItems;
  if ([roles containsObject: SOGoRole_ObjectEraser]
      && [roles containsObject: SOGoRole_FolderEraser])
-    rights |= RightsDeleteAll;
+    rights |= RightsDeleteAll | RightsDeleteOwn;

  if ([roles containsObject: SOGoRole_ObjectEditor])
-    rights |= RightsEditAll;
+    rights |= RightsEditAll | RightsEditOwn;
  if ([roles containsObject: SOGoRole_ObjectViewer])
    rights |= RightsReadItems;
  if ([roles containsObject: SOGoRole_FolderCreator])
@@ -1573,80 +1723,38 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
    rights |= RoleNone; /* actually "folder visible" */

  // [self logWithFormat: @"rights for roles (%@) = %.8x", roles, rights];
- 
+
  return rights;
 }

 - (enum mapistore_error) preloadMessageBodiesWithKeys: (NSArray *) keys
                                          ofTableType: (enum mapistore_table_type) tableType
 {
+  NSEnumerator *enumerator;
+  NSUInteger max;
+  NSString *messageKey;
  MAPIStoreMailMessage *message;
-  NSMutableSet *bodyPartKeys;
-  NSMutableDictionary *keyAssoc;
-  NSDictionary *response;
-  NSUInteger count, max;
-  NSString *messageKey, *messageUid, *bodyPartKey;
-  NGImap4Client *client;
-  NSArray *fetch;
-  NSData *bodyContent;
+  NSArray* bodyContent;

-  if (tableType == MAPISTORE_MESSAGE_TABLE)
+  if (tableType != MAPISTORE_MESSAGE_TABLE)
+    return MAPISTORE_SUCCESS;
+
+  [bodyData removeAllObjects];
+
+  max = [keys count];
+  if (max == 0)
+    return MAPISTORE_SUCCESS;
+
+  enumerator = [keys objectEnumerator];
+  while ((messageKey = [enumerator nextObject]))
    {
-      [bodyData removeAllObjects];
-      max = [keys count];
-
-      if (max > 0)
+      message = [self lookupMessage: messageKey];
+      if (message)
        {
-          bodyPartKeys = [NSMutableSet setWithCapacity: max];
-
-          keyAssoc = [NSMutableDictionary dictionaryWithCapacity: max];
-          for (count = 0; count < max; count++)
+          bodyContent = [message getBodyContent];
+          if (bodyContent)
            {
-              messageKey = [keys objectAtIndex: count];
-              message = [self lookupMessage: messageKey];
-              if (message)
-                {
-                  bodyPartKey = [message bodyContentPartKey];
-                  if (bodyPartKey)
-                    {
-                      [bodyPartKeys addObject: bodyPartKey];
-                      messageUid = [self messageUIDFromMessageKey: messageKey];
-                      /* If the bodyPartKey include peek, remove it as it is not returned
-                         as key in the IMAP server response.
-
-                         IMAP conversation example:
-                         a4 UID FETCH 1 (UID BODY.PEEK[text])
-                         * 1 FETCH (UID 1 BODY[TEXT] {1677}
-                      */
-                      bodyPartKey = [bodyPartKey stringByReplacingOccurrencesOfString: @"body.peek"
-                                                                           withString: @"body"];
-                      [keyAssoc setObject: bodyPartKey forKey: messageUid];
-                    }
-                }
-            }
-      
-          client = [[(SOGoMailFolder *) sogoObject imap4Connection] client];
-          [client select: [sogoObject absoluteImap4Name]];
-          response = [client fetchUids: [keyAssoc allKeys]
-                             parts: [bodyPartKeys allObjects]];
-          fetch = [response objectForKey: @"fetch"];
-          max = [fetch count];
-          for (count = 0; count < max; count++)
-            {
-              response = [fetch objectAtIndex: count];
-              messageUid = [[response objectForKey: @"uid"] stringValue];
-              bodyPartKey = [keyAssoc objectForKey: messageUid];
-              if (bodyPartKey)
-                {
-                  bodyContent = [[response objectForKey: bodyPartKey]
-                                  objectForKey: @"data"];
-                  if (bodyContent)
-                    {
-                      messageKey = [NSString stringWithFormat: @"%@.eml",
-                                             messageUid];
-                      [bodyData setObject: bodyContent forKey: messageKey];
-                    }
-                }
+              [bodyData setObject: bodyContent forKey: messageKey];
            }
        }
    }
@@ -1658,8 +1766,8 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)

@implementation MAPIStoreOutboxFolder

- (int) getPidTagDisplayName: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"Outbox" asUnicodeInMemCtx: memCtx];

@@ -25,8 +25,10 @@

 #import "MAPIStoreMessage.h"

-@class NSData;
@class NSString;
+@class NSArray;
+@class NSMutableArray;
+@class NSMutableDictionary;

@class MAPIStoreAppointmentWrapper;
@class MAPIStoreMailFolder;
@@ -37,12 +39,17 @@
  BOOL mailIsEvent;
  BOOL mailIsMeetingRequest;
  BOOL mailIsSharingObject;
-  NSString *mimeKey;
+
+  NSMutableArray *bodyContentKeys;
+  NSMutableDictionary *bodyPartsEncodings;
+  NSMutableDictionary *bodyPartsCharsets;
+  NSMutableDictionary *bodyPartsMimeTypes;
+  NSMutableDictionary *bodyPartsMixed;
+  
  NSString *headerCharset;
-  NSString *headerEncoding;
  NSString *headerMimeType;
  BOOL bodySetup;
-  NSData *bodyContent;
+  NSArray *bodyContent;
  BOOL fetchedAttachments;

  MAPIStoreAppointmentWrapper *appointmentWrapper;
@@ -50,31 +57,31 @@

 - (NSString *) subject;

- (int) getPidTagIconIndex: (void **) data
-              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagFlagStatus: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagIconIndex: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagFlagStatus: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx;

- (int) getPidTagMessageFlags: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagFollowupIcon: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagImportance: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagReceivedByEmailAddress: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagSenderEmailAddress: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagDisplayTo: (void **) data
-              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagDisplayCc: (void **) data
-              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagDisplayBcc: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagMessageFlags: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagFollowupIcon: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagImportance: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagReceivedByEmailAddress: (void **) data
+                                                inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSenderEmailAddress: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagDisplayTo: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagDisplayCc: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagDisplayBcc: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx;

 /* batch-mode helpers */
- (NSString *) bodyContentPartKey;
- (void) setBodyContentFromRawData: (NSData *) rawContent;
+- (void) setBodyContentFromRawData: (NSArray *) rawContent;
+- (NSArray *) getBodyContent;

@end

@@ -161,15 +161,30 @@ static Class MAPIStoreMailMessageK, NSDataK, NSStringK;
        //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
        //[self logWithFormat: @"  modseq: %.16lx", [modseq unsignedLongLongValue]];
        if (modseq)
-          modseq = [NSNumber numberWithUnsignedLongLong:
-                               [modseq unsignedLongLongValue] + 1];
+          {
+            if (res->relop == RELOP_GT)
+              modseq = [NSNumber numberWithUnsignedLongLong:
+                                   [modseq unsignedLongLongValue] + 1];
+
+          }
        else
          modseq = [NSNumber numberWithUnsignedLongLong: 0];
-        *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"MODSEQ"
-                                                  operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
-                                                  value: modseq];
-        [*qualifier autorelease];
-        rc = MAPIRestrictionStateNeedsEval;
+
+        if (res->relop == RELOP_GT || res->relop == RELOP_GE)
+          {
+            *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"MODSEQ"
+                                                 operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
+                                                            value: modseq];
+            [*qualifier autorelease];
+            rc = MAPIRestrictionStateNeedsEval;
+          }
+        else
+          {
+            /* Ignore other operations as IMAP only support MODSEQ >= X */
+            [self warnWithFormat: @"Ignoring '%@' as only supported operators are > and >=",
+                  NSStringFromSelector ([self operatorFromRestrictionOperator: res->relop])];
+            rc = MAPIRestrictionStateAlwaysTrue;
+          }
      }
      break;
      
@@ -325,10 +340,10 @@ static Class MAPIStoreMailMessageK, NSDataK, NSStringK;
  [self cleanupCaches];
 }

- (int) getRow: (struct mapistore_property_data **) dataP
-     withRowID: (uint32_t) rowId
-  andQueryType: (enum mapistore_query_type) queryType
-      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getRow: (struct mapistore_property_data **) dataP
+                      withRowID: (uint32_t) rowId
+                   andQueryType: (enum mapistore_query_type) queryType
+                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  if (!fetchedCoreInfos)
    {
@@ -337,8 +352,8 @@ static Class MAPIStoreMailMessageK, NSDataK, NSStringK;
         prefetchCoreInfosForMessageKeys: [self restrictedChildKeys]];
    }

- return [super   getRow: dataP withRowID: rowId
-           andQueryType: queryType inMemCtx: memCtx];
+ return [super getRow: dataP withRowID: rowId
+               andQueryType: queryType inMemCtx: memCtx];
 }

@end
@@ -27,7 +27,7 @@

@interface MAPIStoreMailVolatileMessage : MAPIStoreMessage

- (int) submitWithFlags: (enum SubmitFlags) flags;
+- (enum mapistore_error) submitWithFlags: (enum SubmitFlags) flags;

@end

@@ -34,6 +34,7 @@
 #import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSObject+Values.h>
 #import <NGExtensions/NSString+Encoding.h>
 #import <NGMime/NGMimeBodyPart.h>
 #import <NGMime/NGMimeMultipartBody.h>
@@ -166,9 +167,9 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };

 - (BOOL) hasContentId
 {
-  return ([properties
-            objectForKey: MAPIPropertyKey (PR_ATTACH_CONTENT_ID_UNICODE)]
-          != nil);
+  NSString *contentId = [properties
+                          objectForKey: MAPIPropertyKey (PR_ATTACH_CONTENT_ID_UNICODE)];
+  return contentId && [contentId length] > 0;
 }

 - (NGMimeBodyPart *) asMIMEBodyPart
@@ -232,7 +233,7 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
      [map addObject: contentDisposition forKey: @"content-disposition"];
      contentId = [properties
                     objectForKey: MAPIPropertyKey (PR_ATTACH_CONTENT_ID_UNICODE)];
-      if (contentId)
+      if (contentId && [contentId length] > 0)
        [map setObject: [NSString stringWithFormat: @"<%@>", contentId]
                forKey: @"content-id"];
      bodyPart = [NGMimeBodyPart bodyPartWithHeader: map];
@@ -285,21 +286,21 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
  version = [properties objectForKey: @"version"];

  return (version
-          ? exchange_globcnt ([version unsignedLongLongValue])
+          ? [version unsignedLongLongValue]
          : ULLONG_MAX);
 }

- (int) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagChangeKey: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagChangeKey: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSData *changeKey;
-  int rc;
+  enum mapistore_error rc;

  changeKey = [properties objectForKey: MAPIPropertyKey (PR_CHANGE_KEY)];
  if (changeKey)
@@ -337,13 +338,10 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
  NSData *entryId;
  NSDictionary *allRecipients, *dict, *contactInfos;
  SOGoUserManager *mgr;
-  struct ldb_context *samCtx;
  struct mapistore_message *msgData;
  struct mapistore_message_recipient *recipient;
  enum ulRecipClass type;

-  samCtx = [[self context] connectionInfo]->sam_ctx;
-
  // [super getMessageData: &msgData inMemCtx: memCtx];

  msgData = talloc_zero (memCtx, struct mapistore_message);
@@ -388,7 +386,7 @@ static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
            {
              username = [contactInfos objectForKey: @"sAMAccountName"];
              recipient->username = [username asUnicodeInMemCtx: msgData];
-              entryId = MAPIStoreInternalEntryId (samCtx, username);
+              entryId = MAPIStoreInternalEntryId ([[self context] connectionInfo], username);
            }
          else
            {
@@ -681,6 +679,14 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,

  if (!fromResolved)
    {
+      TALLOC_CTX *local_mem_ctx;
+      local_mem_ctx = talloc_new(NULL);
+      if (!local_mem_ctx)
+        {
+          NSLog (@"%s: Out of memory", __PRETTY_FUNCTION__);
+          return;
+        }
+
      NSLog (@"Message without an orig from, try to guess it from PidTagSenderEntryId");
      senderEntryId = [mailProperties objectForKey: MAPIPropertyKey (PR_SENDER_ENTRYID)];
      if (senderEntryId)
@@ -694,12 +700,12 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,

          bin32.cb = [senderEntryId length];
          bin32.lpb = (uint8_t *) [senderEntryId bytes];
-          addrBookEntryId = get_AddressBookEntryId (connInfo->sam_ctx, &bin32);
+          addrBookEntryId = get_AddressBookEntryId (local_mem_ctx, &bin32);
          if (addrBookEntryId && [[NSString stringWithGUID: &addrBookEntryId->ProviderUID]
                                   hasSuffix: @"08002b2fe182"])
            {
              /* TODO: better way to distinguish local and other ones */
-              username = MAPIStoreSamDBUserAttribute (connInfo->sam_ctx, @"legacyExchangeDN",
+              username = MAPIStoreSamDBUserAttribute (connInfo, @"legacyExchangeDN",
                                                      [NSString stringWithUTF8String: addrBookEntryId->X500DN], @"sAMAccountName");
              if (username)
                {
@@ -720,7 +726,7 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
              /* Try with One-Off EntryId */
              struct OneOffEntryId *oneOffEntryId;

-              oneOffEntryId = get_OneOffEntryId (connInfo->sam_ctx, &bin32);
+              oneOffEntryId = get_OneOffEntryId (local_mem_ctx, &bin32);
              if (oneOffEntryId && [[NSString stringWithGUID: &oneOffEntryId->ProviderUID]
                                     hasSuffix: @"00dd010f5402"])
                {
@@ -729,9 +735,7 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
                  [fromRecipient setObject: [NSString stringWithUTF8String: oneOffEntryId->EmailAddress.lpszW]
                                    forKey: @"email"];
                }
-              talloc_free (oneOffEntryId);
            }
-          talloc_free (addrBookEntryId);

          if ([[fromRecipient allKeys] count] > 0)
            {
@@ -741,6 +745,8 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
            }

        }
+      /* Free entryId */
+      talloc_free(local_mem_ctx);
    }

  if (!recipients)
@@ -771,6 +777,12 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
  subjectData = [mailProperties objectForKey: MAPIPropertyKey (PR_NORMALIZED_SUBJECT_UNICODE)];
  if (subjectData)
    [subject appendString: subjectData];
+  if ([subject length] == 0)
+    {
+      subjectData = [mailProperties objectForKey: MAPIPropertyKey (PR_SUBJECT_UNICODE)];
+      if (subjectData)
+        [subject appendString: subjectData];
+    }
  [headers setObject: [subject asQPSubjectString: @"utf-8"] forKey: @"subject"];

  messageId = [mailProperties objectForKey: MAPIPropertyKey (PR_INTERNET_MESSAGE_ID_UNICODE)];
@@ -1001,7 +1013,7 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
 - (NGMimeMessage *) _generateMessageWithBcc: (BOOL) withBcc
 {
  NSString *contentType;
-  NGMimeMessage *message;  
+  NGMimeMessage *message;
  NGMutableHashMap *headers;
  id messageBody;

@@ -1039,8 +1051,9 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
  return messageData;
 }

- (int) submitWithFlags: (enum SubmitFlags) flags
+- (enum mapistore_error) submitWithFlags: (enum SubmitFlags) flags
 {
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSDictionary *recipients;
  NSData *messageData;
  NSMutableArray *recipientEmails;
@@ -1077,6 +1090,7 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
      dd = [activeUser domainDefaults];
      from = [[activeUser allEmails] objectAtIndex: 0];

+      [[self userContext] activate];
      woContext = [[self userContext] woContext];
      authenticator = [sogoObject authenticatorInContext: woContext];
      error = [[SOGoMailer mailerWithDomainDefaults: dd]
@@ -1086,7 +1100,10 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
                  withAuthenticator: authenticator
                          inContext: woContext];
      if (error)
-        [self logWithFormat: @"an error occurred: '%@'", error];
+        {
+          [self errorWithFormat: @"an error occurred: '%@'", error];
+          rc = MAPISTORE_ERR_MSG_SEND;
+        }

      // mapping = [self mapping];
      // [mapping unregisterURLWithID: [self objectId]];
@@ -1098,12 +1115,13 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
    [self logWithFormat: @"skipping submit of message with class '%@'",
          msgClass];

-  return MAPISTORE_SUCCESS;
+  return rc;
 }

 - (void) save: (TALLOC_CTX *) memCtx
 {
-  NSString *folderName, *flag, *newIdString, *messageKey;
+  BOOL updatedMetadata;
+  NSString *folderName, *flag, *newIdString, *messageKey, *changeNumber;
  NSData *changeKey, *messageData;
  NGImap4Connection *connection;
  NGImap4Client *client;
@@ -1139,21 +1157,33 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
      [sogoObject setNameInContainer: messageKey];
      [mapping registerURL: [self url] withID: mid];

-      /* synchronise the cache and update the change key with the one provided
-         by the client. Before doing this, lets issue a unselect/select combo 
-         because of timing issues with Dovecot in obtaining the latest modseq.
-         Sometimes, Dovecot doesn't return the newly appended UID if we do
-         a "UID SORT (DATE) UTF-8 (MODSEQ XYZ) (NOT DELETED)" command (where
-         XYZ is the HIGHESTMODSEQ+1) immediately after IMAP APPEND */
+      /* synchronise the cache and update the predecessor change list
+         with the change key provided by the client. Before doing
+         this, lets issue a unselect/select combo because of timing
+         issues with Dovecot in obtaining the latest modseq.
+         Sometimes, Dovecot doesn't return the newly appended UID if
+         we do a "UID SORT (DATE) UTF-8 (MODSEQ XYZ) (NOT DELETED)"
+         command (where XYZ is the HIGHESTMODSEQ+1) immediately after
+         IMAP APPEND */
      [client unselect];
      [client select: folderName];

      [(MAPIStoreMailFolder *) container synchroniseCache];
      changeKey = [properties objectForKey: MAPIPropertyKey (PR_CHANGE_KEY)];
      if (changeKey)
-        [(MAPIStoreMailFolder *) container
-                setChangeKey: changeKey
-           forMessageWithKey: messageKey];
+        {
+          updatedMetadata = [(MAPIStoreMailFolder *) container updatePredecessorChangeListWith: changeKey
+                                                                             forMessageWithKey: messageKey];
+          if (!updatedMetadata)
+            [self warnWithFormat: @"Predecessor change list not updated with client data"];
+        }
+
+      /* Update version property (PR_CHANGE_KEY indeed) as it is
+         requested once it is saved */
+      changeNumber = [(MAPIStoreMailFolder *) container changeNumberForMessageUID: newIdString];
+      if (changeNumber)
+        [properties setObject: [NSNumber numberWithUnsignedLongLong: [changeNumber unsignedLongLongValue] >> 16]
+                       forKey: @"version"];
    }
 }

@@ -258,7 +258,7 @@ MAPIStoreMappingKeyFromId (uint64_t idNbr)
  if (oldURL != NULL)
    {
      [self errorWithFormat:
-	     @"url with idNbr already registered: (oldUrl='%@', newUrl='%@', id=x%.16"PRIx64")",
+	     @"url with idNbr already registered: (oldUrl='%@', newUrl='%@', id=0x%.16"PRIx64")",
 	     oldURL, urlString, idNbr];
      return NO;
    }
@@ -306,7 +306,7 @@ MAPIStoreMappingKeyFromId (uint64_t idNbr)
    }
  else
    [NSException raise: NSInvalidArgumentException
-                format: @"number of urls and ids do not match"];
+                format: @"number of urls (%d) and ids (%d) do not match", max, [idNbrs count]];
 }

 - (void) unregisterURLWithID: (uint64_t) idNbr
@@ -48,27 +48,28 @@
 - (void) getMessageData: (struct mapistore_message **) dataPtr
               inMemCtx: (TALLOC_CTX *) memCtx;

- (int) modifyRecipientsWithRecipients: (struct mapistore_message_recipient *) recipients
-                              andCount: (NSUInteger) max
-                            andColumns: (struct SPropTagArray *) columns;
+- (enum mapistore_error) modifyRecipientsWithRecipients: (struct mapistore_message_recipient *) recipients
+                                               andCount: (NSUInteger) max
+                                             andColumns: (struct SPropTagArray *) columns;
 - (NSArray *) attachmentKeys;
 - (NSArray *) attachmentKeysMatchingQualifier: (EOQualifier *) qualifier
                             andSortOrderings: (NSArray *) sortOrderings;
 - (id) lookupAttachment: (NSString *) childKey;

 /* backend methods */
- (int) createAttachment: (MAPIStoreAttachment **) attachmentPtr
-                   inAID: (uint32_t *) aidPtr;
- (int) getAttachment: (MAPIStoreAttachment **) attachmentPtr
-              withAID: (uint32_t) aid;
- (int) getAttachmentTable: (MAPIStoreAttachmentTable **) tablePtr
-               andRowCount: (uint32_t *) countPtr;
- (int) setReadFlag: (uint8_t) flag;
+- (enum mapistore_error) createAttachment: (MAPIStoreAttachment **) attachmentPtr
+                                    inAID: (uint32_t *) aidPtr;
+- (enum mapistore_error) getAttachment: (MAPIStoreAttachment **) attachmentPtr
+                               withAID: (uint32_t) aid;
+- (enum mapistore_error) getAttachmentTable: (MAPIStoreAttachmentTable **) tablePtr
+                                andRowCount: (uint32_t *) countPtr;
+- (enum mapistore_error) setReadFlag: (uint8_t) flag;
 - (enum mapistore_error) saveMessage: (TALLOC_CTX *) memCtx;

 - (NSArray *) activeContainerMessageTables;

 - (NSArray *) activeUserRoles;
+- (NSArray *) expandRoles: (NSArray *) roles;

 /* move & copy internal ops */
 - (void) copyToMessage: (MAPIStoreMessage *) newMessage  inMemCtx: (TALLOC_CTX *) memCtx;
@@ -82,6 +83,7 @@

 - (BOOL) subscriberCanReadMessage;
 - (BOOL) subscriberCanModifyMessage;
+- (BOOL) subscriberCanDeleteMessage;

@end

@@ -178,62 +178,107 @@ rtf2html (NSData *compressedRTF)
                          andColumns: (struct SPropTagArray *) columns
 {
  NSMutableDictionary *recipientProperties;
+  enum MAPITAGS prop_tag;
+  char *displayName = NULL;
+  char *email = NULL;
+  enum MAPI_OBJTYPE object_type = 0;
+  char *smtpAddress = NULL;
  SOGoUser *recipientUser;
  NSUInteger count;
+  NSString *recipientEmail = nil;
+  NSString *recipientFullName = nil;
  id value;

  recipientProperties = [NSMutableDictionary dictionaryWithCapacity: columns->cValues + 2];

+  for (count = 0; count < columns->cValues; count++)
+    {
+      prop_tag = columns->aulPropTag[count];
+      switch(prop_tag) {
+      case PidTagDisplayName:   
+        displayName = recipient->data[count];  
+        break;
+      case PidTagEmailAddress:
+        email = recipient->data[count];
+        break;
+      case PidTagObjectType:
+        if (recipient->data[count])
+          object_type = *((uint8_t*) recipient->data[count]);
+        break;
+      case PidTagSmtpAddress:
+        smtpAddress = recipient->data[count];
+        break;
+      default:
+        break;
+      }
+
+      if (recipient->data[count])
+        {
+          value = NSObjectFromValuePointer (prop_tag,
+                                            recipient->data[count]);
+          if (value) 
+              [recipientProperties setObject: value
+                                      forKey: MAPIPropertyKey (prop_tag)];
+        }
+    }
+
  if (recipient->username)
    {
      value = [NSString stringWithUTF8String: recipient->username];
      [recipientProperties setObject: value forKey: @"x500dn"];
+    }

+  if (object_type == MAPI_MAILUSER && recipient->username)
+    {
+      /* values from user object have priority over data sent by the client */
      recipientUser = [SOGoUser userWithLogin: [value lowercaseString]];
      if (recipientUser)
        {
          value = [recipientUser cn];
          if ([value length] > 0)
-            [recipientProperties setObject: value forKey: @"fullName"];
+            recipientFullName = value;
+          
          value = [[recipientUser allEmails] objectAtIndex: 0];
          if ([value length] > 0)
-            [recipientProperties setObject: value forKey: @"email"];
-        }
-    }
-  else
-    {
-      if (recipient->data[0])
-        {
-          value = [NSString stringWithUTF8String: recipient->data[0]];
-          if ([value length] > 0)
-            [recipientProperties setObject: value forKey: @"fullName"];
-        }
-      if (recipient->data[1])
-        {
-          value = [NSString stringWithUTF8String: recipient->data[1]];
-          if ([value length] > 0)
-            [recipientProperties setObject: value forKey: @"email"];
-        }
+            recipientEmail = value;
+        } 
    }

-  for (count = 0; count < columns->cValues; count++)
+  /* If we do not have values from the user object we try to get them from the parameters */
+  if (!recipientFullName && displayName) 
    {
-      if (recipient->data[count])
-        {
-          value = NSObjectFromValuePointer (columns->aulPropTag[count],
-                                            recipient->data[count]);
-          if (value)
-            [recipientProperties setObject: value
-                                    forKey: MAPIPropertyKey (columns->aulPropTag[count])];
-        }
+      value = [NSString stringWithUTF8String: displayName];
+      if ([value length] > 0)
+          recipientFullName = value;
    }

+  if (!recipientEmail && email) 
+    {
+      value = [NSString stringWithUTF8String: email];
+      if ([value length] > 0)
+        recipientEmail = value;
+    }
+
+  if (!recipientEmail && smtpAddress)
+    {
+      value = [NSString stringWithUTF8String: smtpAddress];
+      if ([value length] > 0)
+          recipientEmail = value;
+    }
+
+  /* Now we can set the properties if we have them */
+  if (recipientFullName) 
+    [recipientProperties setObject: recipientFullName forKey: @"fullName"];
+
+  if (recipientEmail)
+    [recipientProperties setObject: recipientEmail forKey: @"email"];  
+
  return recipientProperties;
 }

- (int) modifyRecipientsWithRecipients: (struct mapistore_message_recipient *) newRecipients
-                              andCount: (NSUInteger) max
-                            andColumns: (struct SPropTagArray *) columns;
+- (enum mapistore_error) modifyRecipientsWithRecipients: (struct mapistore_message_recipient *) newRecipients
+                                               andCount: (NSUInteger) max
+                                             andColumns: (struct SPropTagArray *) columns;
 {
  static NSString *recTypes[] = { @"orig", @"to", @"cc", @"bcc" };
  NSDictionary *recipientProperties;
@@ -273,7 +318,7 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_SUCCESS;
 }

- (int) addPropertiesFromRow: (struct SRow *) aRow
+- (enum mapistore_error) addPropertiesFromRow: (struct SRow *) aRow
 {
  enum mapistore_error rc;
  MAPIStoreContext *context;
@@ -352,11 +397,11 @@ rtf2html (NSData *compressedRTF)
  return newAttachment;
 }

- (int) createAttachment: (MAPIStoreAttachment **) attachmentPtr
-                   inAID: (uint32_t *) aidPtr
+- (enum mapistore_error) createAttachment: (MAPIStoreAttachment **) attachmentPtr
+                                    inAID: (uint32_t *) aidPtr
 {
  MAPIStoreAttachment *attachment;
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;

  attachment = [self createAttachment];
  if (attachment)
@@ -377,12 +422,12 @@ rtf2html (NSData *compressedRTF)
  return nil;
 }

- (int) getAttachment: (MAPIStoreAttachment **) attachmentPtr
-              withAID: (uint32_t) aid
+- (enum mapistore_error) getAttachment: (MAPIStoreAttachment **) attachmentPtr
+                               withAID: (uint32_t) aid
 {
  MAPIStoreAttachment *attachment;
  NSArray *keys;
-  int rc = MAPISTORE_ERR_NOT_FOUND;
+  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;

  keys = [self attachmentKeys];
  if (aid < [keys count])
@@ -398,11 +443,11 @@ rtf2html (NSData *compressedRTF)
  return rc;
 }

- (int) getAttachmentTable: (MAPIStoreAttachmentTable **) tablePtr
-               andRowCount: (uint32_t *) countPtr
+- (enum mapistore_error) getAttachmentTable: (MAPIStoreAttachmentTable **) tablePtr
+                                andRowCount: (uint32_t *) countPtr
 {
  MAPIStoreAttachmentTable *attTable;
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;

  attTable = [self attachmentTable];
  if (attTable)
@@ -502,13 +547,15 @@ rtf2html (NSData *compressedRTF)
          for (count = 0; count < max; count++)
            [[containerTables objectAtIndex: count] restrictedChildKeys];
        }
-  
+
+      /* TODO: Check the save process succeeded */
      [self save: memCtx];
-      /* We make sure that any change-related properties are removes from the
+      /* We make sure that any change-related properties are removed from the
         properties dictionary, to make sure that related methods will be
         invoked the next time they are requested. */
      [properties removeObjectForKey: MAPIPropertyKey (PidTagChangeKey)];
      [properties removeObjectForKey: MAPIPropertyKey (PidTagChangeNumber)];
+      [properties removeObjectForKey: MAPIPropertyKey (PidTagPredecessorChangeList)];

      if ([container isKindOfClass: MAPIStoreFolderK])
        {
@@ -536,8 +583,8 @@ rtf2html (NSData *compressedRTF)
 }

 /* getters */
- (int) getPidTagInstID: (void **) data // TODO: DOUBT
-               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagInstID: (void **) data // TODO: DOUBT
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  /* we return a unique id based on the key */
  *data = MAPILongLongValue (memCtx, [[sogoObject nameInContainer] hash]);
@@ -545,22 +592,22 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagInstanceNum: (void **) data // TODO: DOUBT
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagInstanceNum: (void **) data // TODO: DOUBT
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagRowType: (void **) data // TODO: DOUBT
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagRowType: (void **) data // TODO: DOUBT
+                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, TBL_LEAF_ROW);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagDepth: (void **) data // TODO: DOUBT
-              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDepth: (void **) data // TODO: DOUBT
+                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongLongValue (memCtx, 0);

@@ -577,8 +624,8 @@ rtf2html (NSData *compressedRTF)
  0x00000010 Create Contents Table
  0x00000020 Create Associated Contents Table
 */
- (int) getPidTagAccess: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAccess: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t access = 0;
  BOOL userIsOwner;
@@ -603,8 +650,7 @@ rtf2html (NSData *compressedRTF)
  if (userIsOwner
      || ([self isKindOfClass: MAPIStoreEmbeddedMessageK]
          && [mainMessage subscriberCanModifyMessage])
-      || [(MAPIStoreFolder *)
-           [mainMessage container] subscriberCanDeleteMessages])
+      || [mainMessage subscriberCanDeleteMessage])
    access |= 0x04;
  
  *data = MAPILongValue (memCtx, access);
@@ -618,8 +664,8 @@ rtf2html (NSData *compressedRTF)
  0x00000000 Read-Only
  0x00000001 Modify
 */
- (int) getPidTagAccessLevel: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAccessLevel: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t access = 0;
  BOOL userIsOwner;
@@ -638,20 +684,20 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_SUCCESS;
 }

- (int ) getPidTagHasNamedProperties: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagHasNamedProperties: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getYes: data inMemCtx: memCtx];
 }

- (int) getPidLidSideEffects: (void **) data // TODO
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSideEffects: (void **) data // TODO
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidLidCurrentVersion: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidCurrentVersion: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  // *data = MAPILongValue (memCtx, 115608); // Outlook 11.5608
  *data = MAPILongValue (memCtx, 0x1ce3a); // Outlook 11.8330
@@ -659,34 +705,34 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidCurrentVersionName: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidCurrentVersionName: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"11.0" asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidAutoProcessState: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidAutoProcessState: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0x00000000);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagFolderId: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagFolderId: (void **) data
+                                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongLongValue (memCtx, [container objectId]);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMid: (void **) data
-            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMid: (void **) data
+                             inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
  uint64_t obId;

  obId = [self objectId];
@@ -701,24 +747,24 @@ rtf2html (NSData *compressedRTF)
  return rc;
 }

- (int) getPidTagMessageLocaleId: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageLocaleId: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0x0409);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMessageFlags: (void **) data // TODO
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageFlags: (void **) data // TODO
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, MSGFLAG_FROMME | MSGFLAG_READ | MSGFLAG_UNMODIFIED);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMessageSize: (void **) data // TODO
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageSize: (void **) data // TODO
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  /* TODO: choose another name in SOGo for that method */
  *data = MAPILongValue (memCtx, [[sogoObject davContentLength] intValue]);
@@ -726,30 +772,30 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagImportance: (void **) data // TODO -> subclass?
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagImportance: (void **) data // TODO -> subclass?
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 1);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagPriority: (void **) data // TODO -> subclass?
-                 inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagPriority: (void **) data // TODO -> subclass?
+                                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagSensitivity: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSensitivity: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagSubject: (void **) data
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSubject: (void **) data
+                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
  TALLOC_CTX *localMemCtx;
  char *prefix, *normalizedSubject;

@@ -770,71 +816,71 @@ rtf2html (NSData *compressedRTF)
  return rc;
 }

- (int) getPidTagNormalizedSubject: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagNormalizedSubject: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagOriginalSubject: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagOriginalSubject: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagSubject: data inMemCtx: memCtx];
 }

- (int) getPidTagConversationTopic: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagConversationTopic: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagNormalizedSubject: data inMemCtx: memCtx];
 }

- (int) getPidTagSubjectPrefix: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSubjectPrefix: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getEmptyString: data inMemCtx: memCtx];
 }

- (int) getPidTagDeleteAfterSubmit: (void **) data // TODO
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDeleteAfterSubmit: (void **) data // TODO
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidTagDisplayTo: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayTo: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getEmptyString: data inMemCtx: memCtx];
 }

- (int) getPidTagDisplayCc: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayCc: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getEmptyString: data inMemCtx: memCtx];
 }

- (int) getPidTagDisplayBcc: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayBcc: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getEmptyString: data inMemCtx: memCtx];
 }

-// - (int) getPidTagOriginalDisplayTo: (void **) data
+// - (enum mapistore_error) getPidTagOriginalDisplayTo: (void **) data
 // {
 //   return [self getPidTagDisplayTo: data];
 // }

-// - (int) getPidTagOriginalDisplayCc: (void **) data
+// - (enum mapistore_error) getPidTagOriginalDisplayCc: (void **) data
 // {
 //   return [self getPidTagDisplayCc: data];
 // }

-// - (int) getPidTagOriginalDisplayBcc: (void **) data
+// - (enum mapistore_error) getPidTagOriginalDisplayBcc: (void **) data
 // {
 //   return [self getPidTagDisplayBcc: data];
 // }

- (int) getPidTagLastModifierName: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagLastModifierName: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSURL *contextUrl;

@@ -844,22 +890,22 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMessageClass: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageClass: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  [self subclassResponsibility: _cmd];

  return MAPISTORE_ERR_NOT_FOUND;
 }

- (int) getPidTagOriginalMessageClass: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagOriginalMessageClass: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getProperty: data withTag: PidTagMessageClass inMemCtx: memCtx];
 }

- (int) getPidTagHasAttachments: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagHasAttachments: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPIBoolValue (memCtx,
                         [[self attachmentKeys] count] > 0);
@@ -867,13 +913,13 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagAssociated: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagAssociated: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];;
 }

- (int) setReadFlag: (uint8_t) flag
+- (enum mapistore_error) setReadFlag: (uint8_t) flag
 {
  // [self subclassResponsibility: _cmd];

@@ -935,20 +981,38 @@ rtf2html (NSData *compressedRTF)
      activeUserRoles = [[context activeUser]
                          rolesForObject: sogoObject
                               inContext: [userContext woContext]];
+      /* We use in this library the roles as flags, so we expand high
+         access rights with the lower ones */
+      activeUserRoles = [self expandRoles: activeUserRoles];
      [activeUserRoles retain];
    }

  return activeUserRoles;
 }

+/* Expand current roles with lower access roles to transform them to
+   flags */
+- (NSArray *) expandRoles: (NSArray *) roles
+{
+  return roles;
+}
+
+/* Can the current active user read the message? */
 - (BOOL) subscriberCanReadMessage
 {
  return NO;
 }

+/* Can the current active user modify the message? */
 - (BOOL) subscriberCanModifyMessage
 {
  return NO;
 }

+/* Can the current active user delete the message? */
+- (BOOL) subscriberCanDeleteMessage
+{
+  return NO;
+}
+
@end
@@ -1,6 +1,7 @@
 /* MAPIStoreNotesContext.m - this file is part of SOGo
 *
 * Copyright (C) 2010-2012 Inverse inc.
+ * Copyright (C) 2016 Enrique J. Hernandez
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -30,13 +31,30 @@
 #undef DEBUG
 #include <mapistore/mapistore.h>

+static Class MAPIStoreNotesFolderK;
+
@implementation MAPIStoreNotesContext

+ (void) initialize
+{
+  MAPIStoreNotesFolderK = [MAPIStoreNotesFolder class];
+}
+
 + (NSString *) MAPIModuleName
 {
  return @"notes";
 }

+ (enum mapistore_context_role) MAPIContextRole
+{
+  return MAPISTORE_NOTES_ROLE;
+}
+
+- (Class) MAPIStoreFolderClass
+{
+  return MAPIStoreNotesFolderK;
+}
+
 + (struct mapistore_contexts_list *) listContextsForUser: (NSString *)  userName
                                         withIndexing: (struct indexing_context *) indexing
                                                inMemCtx: (TALLOC_CTX *) memCtx
@@ -30,8 +30,8 @@

@implementation MAPIStoreNotesFolder

- (int) getPidTagDefaultPostMessageClass: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDefaultPostMessageClass: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.StickyNote" asUnicodeInMemCtx: memCtx];

@@ -32,8 +32,8 @@

@implementation MAPIStoreNotesMessage

- (int) getPidTagIconIndex: (void **) data // TODO
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagIconIndex: (void **) data // TODO
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  /* see http://msdn.microsoft.com/en-us/library/cc815472.aspx */
  // *longValue = 0x00000300 for blue
@@ -46,7 +46,7 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.StickyNote" asUnicodeInMemCtx: memCtx];

@@ -68,27 +68,27 @@
 - (NSMutableDictionary *) properties;

 /* ops */
- (int) getProperties: (struct mapistore_property_data *) data
-             withTags: (enum MAPITAGS *) tags
-             andCount: (uint16_t) columnCount
-             inMemCtx: (TALLOC_CTX *) localMemCtx;
+- (enum mapistore_error) getProperties: (struct mapistore_property_data *) data
+                              withTags: (enum MAPITAGS *) tags
+                              andCount: (uint16_t) columnCount
+                              inMemCtx: (TALLOC_CTX *) localMemCtx;

- (int) addPropertiesFromRow: (struct SRow *) aRow;
+- (enum mapistore_error) addPropertiesFromRow: (struct SRow *) aRow;

- (int) getProperty: (void **) data
-            withTag: (enum MAPITAGS) propTag
-           inMemCtx: (TALLOC_CTX *) localMemCtx;
+- (enum mapistore_error) getProperty: (void **) data
+                             withTag: (enum MAPITAGS) propTag
+                            inMemCtx: (TALLOC_CTX *) localMemCtx;

 /* helper getters */
 - (NSData *) getReplicaKeyFromGlobCnt: (uint64_t) objectCnt;
- (int) getReplicaKey: (void **) data
-          fromGlobCnt: (uint64_t) objectCnt
-             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getReplicaKey: (void **) data
+                           fromGlobCnt: (uint64_t) objectCnt
+                              inMemCtx: (TALLOC_CTX *) memCtx;

- (int) getPidTagCreationTime: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagLastModificationTime: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagCreationTime: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagLastModificationTime: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx;

 /* move and copy operations */
 - (void) copyPropertiesToObject: (MAPIStoreObject *) newObject  inMemCtx: (TALLOC_CTX *) memCtx;
@@ -150,15 +150,15 @@ static Class NSExceptionK, MAPIStoreFolderK;
  return properties;
 }

- (int) getProperty: (void **) data
-            withTag: (enum MAPITAGS) propTag
-           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getProperty: (void **) data
+                             withTag: (enum MAPITAGS) propTag
+                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  MAPIStorePropertyGetter method = NULL;
  uint16_t propValue;
  SEL methodSel;
  id value;
-  int rc = MAPISTORE_ERR_NOT_FOUND;
+  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
  NSUInteger count, max;

  value = [properties objectForKey: MAPIPropertyKey (propTag)];
@@ -186,16 +186,16 @@ static Class NSExceptionK, MAPIStoreFolderK;
  return rc;
 }

- (int) getPidTagCreationTime: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagCreationTime: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self creationTime] asFileTimeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagLastModificationTime: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagLastModificationTime: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self lastModificationTime] asFileTimeInMemCtx: memCtx];

@@ -219,10 +219,10 @@ static Class NSExceptionK, MAPIStoreFolderK;
  return canGetProperty;
 }

- (int) getProperties: (struct mapistore_property_data *) data
-             withTags: (enum MAPITAGS *) tags
-             andCount: (uint16_t) columnCount
-             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getProperties: (struct mapistore_property_data *) data
+                              withTags: (enum MAPITAGS *) tags
+                              andCount: (uint16_t) columnCount
+                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint16_t count;

@@ -239,7 +239,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
  [proxies addObject: newProxy];
 }

- (int) addPropertiesFromRow: (struct SRow *) aRow
+- (enum mapistore_error) addPropertiesFromRow: (struct SRow *) aRow
 {
  struct SPropValue *cValue;
  NSUInteger counter;
@@ -298,9 +298,9 @@ static Class NSExceptionK, MAPIStoreFolderK;
  return replicaKey;
 }

- (int) getReplicaKey: (void **) data
-          fromGlobCnt: (uint64_t) objectCnt
-             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getReplicaKey: (void **) data
+                           fromGlobCnt: (uint64_t) objectCnt
+                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[self getReplicaKeyFromGlobCnt: objectCnt] asBinaryInMemCtx: memCtx];

@@ -51,7 +51,7 @@
  MAPIStorePropertyGetter method;
  uint16_t propValue;
  SEL methodSel;
-  int rc;
+  enum mapistore_error rc;

  propValue = (propTag & 0xffff0000) >> 16;
  methodSel = MAPIStoreSelectorForPropertyGetter (propValue);
@@ -84,16 +84,16 @@
  return memberId;
 }

- (int) getPidTagMemberId: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMemberId: (void **) data
+                                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongLongValue (memCtx, memberId);

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagEntryId: (void **) data
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagEntryId: (void **) data
+                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSData *entryId;
  struct mapistore_connection_info *connInfo;
@@ -103,15 +103,15 @@
  else
    {
      connInfo = [(MAPIStoreContext *) [container context] connectionInfo];
-      entryId = MAPIStoreInternalEntryId (connInfo->sam_ctx, userId);
+      entryId = MAPIStoreInternalEntryId (connInfo, userId);
    }
  *data = [entryId asBinaryInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMemberName: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMemberName: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *displayName;

@@ -127,13 +127,14 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMemberRights: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMemberRights: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t rights;
  NSArray *roles;

  roles = [[(MAPIStoreFolder *) container aclFolder] aclsForUser: userId];
+  roles = [(MAPIStoreFolder *) container expandRoles: roles];
  rights = [(MAPIStoreFolder *) container exchangeRightsForRoles: roles];

  *data = MAPILongValue (memCtx, rights);
@@ -25,12 +25,9 @@

 #include <talloc.h>

-#import <Foundation/NSTimeZone.h>
-
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalRecurrenceRule.h>
-
-@class NSTimeZone;
+#import <NGCards/iCalTimeZone.h>

@class iCalEvent;
@class iCalRepeatableEntityObject;
@@ -46,7 +43,7 @@
                   fromRecurrencePattern: (struct RecurrencePattern *) rp
                          withExceptions: (struct ExceptionInfo *) exInfos
                       andExceptionCount: (uint16_t) exInfoCount
-                              inTimeZone: (NSTimeZone *) tz;
+                              inTimeZone: (iCalTimeZone *) tz;

@end

@@ -54,7 +51,6 @@

 - (void) fillRecurrencePattern: (struct RecurrencePattern *) rp
                     withEvent: (iCalEvent *) event
-                    inTimeZone: (NSTimeZone *) timeZone
                      inMemCtx: (TALLOC_CTX *) memCtx;

@end
@@ -24,7 +24,6 @@
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSSet.h>
 #import <Foundation/NSString.h>
-#import <Foundation/NSTimeZone.h>

 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -35,6 +34,7 @@
 #import <NGCards/iCalRepeatableEntityObject.h>
 #import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalTimeZone.h>
+#import <NGCards/iCalTimeZonePeriod.h>

 #import "NSDate+MAPIStore.h"
 #import "MAPIStoreRecurrenceUtils.h"
@@ -51,7 +51,7 @@
                   fromRecurrencePattern: (struct RecurrencePattern *) rp
                          withExceptions: (struct ExceptionInfo *) exInfos
                       andExceptionCount: (uint16_t) exInfoCount
-                              inTimeZone: (NSTimeZone *) tz
+                              inTimeZone: (iCalTimeZone *) tz

 {
  NSCalendarDate *startDate, *olEndDate, *untilDate, *exDate;
@@ -63,7 +63,7 @@
  iCalWeekOccurrence weekOccurrence;
  iCalWeekOccurrences dayMaskDays;
  NSUInteger count, max;
-  NSInteger bySetPos;
+  NSInteger bySetPos, tzOffset;
  unsigned char maskValue;

  [entity removeAllRecurrenceRules];
@@ -242,9 +242,10 @@
          {
            /* The OriginalStartDate is in local time */
            exDate = [NSDate dateFromMinutesSince1601: exInfos[count].OriginalStartDate];
+            tzOffset = -[[tz periodForDate: exDate] secondsOffsetFromGMT];
            exDate = [exDate dateByAddingYears: 0 months: 0 days: 0
                                         hours: 0 minutes: 0
-                                       seconds: - [tz secondsFromGMT]];
+                                       seconds: tzOffset];
            [exceptionDates removeObject: exDate];
          }
      }
@@ -263,7 +264,6 @@

 - (void) fillRecurrencePattern: (struct RecurrencePattern *) rp
                     withEvent: (iCalEvent *) event
-                    inTimeZone: (NSTimeZone *) timeZone
                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  iCalRecurrenceFrequency freq;
@@ -279,10 +279,8 @@
  NSMutableArray *deletedDates, *modifiedDates;

  startDate = [event firstRecurrenceStartDate];
-  [startDate setTimeZone: timeZone];
  endDate = [event lastPossibleRecurrenceStartDate];
-  [endDate setTimeZone: timeZone];
-  
+
  rp->ReaderVersion = 0x3004;
  rp->WriterVersion = 0x3004;

@@ -61,20 +61,25 @@ static BOOL initialization_done = NO;
    if (!initialization_done) { \
        OC_DEBUG(5, "[SOGo] You should call sogo_backend_init() first. Current thread: %p, pid: %d\n", \
                 GSCurrentThread(), getpid());                         \
-    }
-#define NS_CURRENT_THREAD_TRY_UNREGISTER() \
+    } \
+    OC_DEBUG(5, "[SOGo] --->");
+
+#define NS_CURRENT_THREAD_TRY_UNREGISTER(rc) \
    if (__nsrct_thread_registered) { \
        GSUnregisterCurrentThread(); \
-    }
+    } \
+    OC_DEBUG(6, "[SOGo] <--- [%s]", mapistore_errstr (rc));

 #define TRYCATCH_START @try {
 #define TRYCATCH_END(pool)  \
          } @catch (NSException * e) { \
            enum mapistore_error ret = sogo_backend_handle_objc_exception(e, __PRETTY_FUNCTION__, __LINE__); \
+            mapiapp_cleanup(); \
            [pool release]; \
-            NS_CURRENT_THREAD_TRY_UNREGISTER(); \
+            NS_CURRENT_THREAD_TRY_UNREGISTER(ret); \
            return ret; \
-          }
+          } \
+        mapiapp_cleanup();


 static enum mapistore_error
@@ -141,6 +146,8 @@ sogo_backend_init (void)
  NSUserDefaults *ud;
  SoProductRegistry *registry;
  char *argv[] = { SAMBA_PREFIX "/sbin/samba", NULL };
+  NSString *debugLevel;
+  uint8_t parentLogLevel;

  GSRegisterCurrentThread();

@@ -165,6 +172,11 @@ sogo_backend_init (void)

  /* We force the plugin to base its configuration on the SOGo tree. */
  ud = [NSUserDefaults standardUserDefaults];
+
+  /* Ensure imap4Connection calls raise Exception if
+    IMAP connection is not established. See NGImap4Connection.m */
+  [ud setBool: YES forKey: @"SoIMAP4ExceptionsEnabled"];
+
  if (!leakDebugging && [ud boolForKey: @"SOGoDebugLeaks"])
    {
      NSLog (@"  leak debugging on");
@@ -173,6 +185,22 @@ sogo_backend_init (void)
      leakDebugging = YES;
    }

+  /* Set debug level according to samba */
+  parentLogLevel = DEBUGLEVEL_CLASS[DBGC_ALL]; // FIXME: samba logger specific code
+  if (parentLogLevel >= 4)
+    debugLevel = @"DEBUG";
+  else if (parentLogLevel >= 3)
+    debugLevel = @"INFO";
+  else if (parentLogLevel >= 2)
+    debugLevel = @"WARN";
+  else if (parentLogLevel >= 1)
+    debugLevel = @"ERROR";
+  else
+    debugLevel = @"FATAL";
+  OC_DEBUG(3, "[SOGo] Setting log level to %s", [debugLevel UTF8String]);
+  [ud setObject: debugLevel forKey: @"NGLogDefaultLogLevel"];
+  [ud synchronize];
+
  registry = [SoProductRegistry sharedProductRegistry];
  [registry scanForProductsInDirectory: SOGO_BUNDLES_DIR];

@@ -196,12 +224,33 @@ sogo_backend_init (void)
  return MAPISTORE_SUCCESS;
 }

+/**
+   \details Cleanup operation to execute after an action has been performed
+   so there won't be any conflicts with future calls.
+   In practice this will deactivate the current user context set on MAPIApp
+   (which is the current WOApplication), this means two things: (1) set nil
+   as current user context on MAPIApp and (2) remove woContext from current
+   thread dictionary (this is used on WOContext.m).
+*/
+static void mapiapp_cleanup(void)
+{
+  Class MAPIApplicationK;
+  MAPIApplicationK = NSClassFromString (@"MAPIApplication");
+  if (MAPIApplicationK)
+    [[MAPIApplicationK application] cleanup];
+}
+
 /**
   \details Create a connection context to the sogo backend

   \param mem_ctx pointer to the memory context
+   \param conn_info pointer to the connection information available for this context
+                    (database connection, connected user, replica server info)
+   \param indexing pointer to the indexing database connection
   \param uri pointer to the sogo path
-   \param private_data pointer to the private backend context 
+   \param private_data pointer to the private backend context
+
+   \note the developer must free allocated private_data
 */

 static enum mapistore_error
@@ -212,9 +261,7 @@ sogo_backend_create_context(TALLOC_CTX *mem_ctx,
 {
  NSAutoreleasePool *pool;
  MAPIStoreContext *context;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  NS_CURRENT_THREAD_REGISTER();
  pool = [NSAutoreleasePool new];
@@ -234,7 +281,7 @@ sogo_backend_create_context(TALLOC_CTX *mem_ctx,
    rc = MAPISTORE_ERROR;

  [pool release];
-  NS_CURRENT_THREAD_TRY_UNREGISTER();
+  NS_CURRENT_THREAD_TRY_UNREGISTER(rc);

  return rc;
 }
@@ -249,9 +296,7 @@ sogo_backend_create_root_folder (const char *username,
  NSAutoreleasePool *pool;
  NSString *userName, *folderName;
  NSString *mapistoreUri;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  NS_CURRENT_THREAD_REGISTER();
  pool = [NSAutoreleasePool new];
@@ -274,7 +319,7 @@ sogo_backend_create_root_folder (const char *username,
    rc = MAPISTORE_ERROR;

  [pool release];
-  NS_CURRENT_THREAD_TRY_UNREGISTER();
+  NS_CURRENT_THREAD_TRY_UNREGISTER(rc);

  return rc;
 }
@@ -286,9 +331,7 @@ sogo_backend_list_contexts(const char *username, struct indexing_context *indexi
 {
  NSAutoreleasePool *pool;
  NSString *userName;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  NS_CURRENT_THREAD_REGISTER();
  pool = [NSAutoreleasePool new];
@@ -307,7 +350,7 @@ sogo_backend_list_contexts(const char *username, struct indexing_context *indexi
    rc = MAPISTORE_ERROR;

  [pool release];
-  NS_CURRENT_THREAD_TRY_UNREGISTER();
+  NS_CURRENT_THREAD_TRY_UNREGISTER(rc);

  return rc;
 }
@@ -334,9 +377,7 @@ sogo_context_get_path(void *backend_object, TALLOC_CTX *mem_ctx,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreContext *context;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (backend_object)
    {
@@ -350,7 +391,7 @@ sogo_context_get_path(void *backend_object, TALLOC_CTX *mem_ctx,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -368,9 +409,7 @@ sogo_context_get_root_folder(void *backend_object, TALLOC_CTX *mem_ctx,
  NSAutoreleasePool *pool;
  MAPIStoreContext *context;
  MAPIStoreFolder *folder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (backend_object)
    {
@@ -386,7 +425,7 @@ sogo_context_get_root_folder(void *backend_object, TALLOC_CTX *mem_ctx,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -411,9 +450,7 @@ sogo_folder_open_folder(void *folder_object, TALLOC_CTX *mem_ctx, uint64_t fid,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder, *childFolder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -430,7 +467,7 @@ sogo_folder_open_folder(void *folder_object, TALLOC_CTX *mem_ctx, uint64_t fid,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -442,7 +479,7 @@ sogo_folder_open_folder(void *folder_object, TALLOC_CTX *mem_ctx, uint64_t fid,

 /**
   \details Create a folder in the sogo backend
-   
+
   \param private_data pointer to the current sogo context

   \return MAPISTORE_SUCCESS on success, otherwise MAPISTORE_ERROR
@@ -455,9 +492,7 @@ sogo_folder_create_folder(void *folder_object, TALLOC_CTX *mem_ctx,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder, *childFolder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -473,7 +508,7 @@ sogo_folder_create_folder(void *folder_object, TALLOC_CTX *mem_ctx,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -498,9 +533,7 @@ sogo_folder_delete(void *folder_object)
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -514,7 +547,7 @@ sogo_folder_delete(void *folder_object)
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -530,9 +563,7 @@ sogo_folder_get_child_count(void *folder_object, enum mapistore_table_type table
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -546,7 +577,7 @@ sogo_folder_get_child_count(void *folder_object, enum mapistore_table_type table
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -566,9 +597,7 @@ sogo_folder_open_message(void *folder_object,
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
  MAPIStoreMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -587,7 +616,7 @@ sogo_folder_open_message(void *folder_object,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -608,9 +637,7 @@ sogo_folder_create_message(void *folder_object,
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
  MAPIStoreMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -622,13 +649,13 @@ sogo_folder_create_message(void *folder_object,
      TRYCATCH_START
      rc = [folder createMessage: &message
                         withMID: mid
-		    isAssociated: associated];
+                    isAssociated: associated];
      if (rc == MAPISTORE_SUCCESS)
        *message_object = [message tallocWrapper: mem_ctx];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -644,9 +671,7 @@ sogo_folder_delete_message(void *folder_object, uint64_t mid, uint8_t flags)
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -660,7 +685,7 @@ sogo_folder_delete_message(void *folder_object, uint64_t mid, uint8_t flags)
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -677,14 +702,13 @@ sogo_folder_move_copy_messages(void *folder_object,
                               uint32_t mid_count,
                               uint64_t *src_mids, uint64_t *t_mids,
                               struct Binary_r **target_change_keys,
+                               struct Binary_r **target_predecessor_change_lists,
                               uint8_t want_copy)
 {
  MAPIStoreFolder *sourceFolder, *targetFolder;
  NSAutoreleasePool *pool;
  struct MAPIStoreTallocWrapper *wrapper;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -703,12 +727,13 @@ sogo_folder_move_copy_messages(void *folder_object,
                                       fromFolder: sourceFolder
                                         withMIDs: t_mids
                                    andChangeKeys: target_change_keys
+                        andPredecessorChangeLists: target_predecessor_change_lists
                                         wantCopy: want_copy
                                         inMemCtx: mem_ctx];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -726,9 +751,7 @@ sogo_folder_move_folder(void *folder_object, void *target_folder_object,
  MAPIStoreFolder *moveFolder, *targetFolder;
  NSString *newFolderName;
  struct MAPIStoreTallocWrapper *wrapper;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -758,7 +781,7 @@ sogo_folder_move_folder(void *folder_object, void *target_folder_object,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -776,9 +799,7 @@ sogo_folder_copy_folder(void *folder_object, void *target_folder_object, TALLOC_
  MAPIStoreFolder *copyFolder, *targetFolder;
  NSString *newFolderName;
  struct MAPIStoreTallocWrapper *wrapper;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -802,7 +823,7 @@ sogo_folder_copy_folder(void *folder_object, void *target_folder_object, TALLOC_
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -820,9 +841,7 @@ sogo_folder_get_deleted_fmids(void *folder_object, TALLOC_CTX *mem_ctx,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -840,7 +859,7 @@ sogo_folder_get_deleted_fmids(void *folder_object, TALLOC_CTX *mem_ctx,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -859,9 +878,7 @@ sogo_folder_open_table(void *folder_object, TALLOC_CTX *mem_ctx,
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -880,7 +897,7 @@ sogo_folder_open_table(void *folder_object, TALLOC_CTX *mem_ctx,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -898,9 +915,7 @@ sogo_folder_modify_permissions(void *folder_object, uint8_t flags,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -916,7 +931,7 @@ sogo_folder_modify_permissions(void *folder_object, uint8_t flags,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -932,9 +947,7 @@ sogo_folder_preload_message_bodies(void *folder_object, enum mapistore_table_typ
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreFolder *folder;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (folder_object)
    {
@@ -949,7 +962,7 @@ sogo_folder_preload_message_bodies(void *folder_object, enum mapistore_table_typ
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -967,9 +980,7 @@ sogo_message_get_message_data(void *message_object,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -984,8 +995,8 @@ sogo_message_get_message_data(void *message_object,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
      rc = MAPISTORE_SUCCESS;
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1002,9 +1013,7 @@ sogo_message_create_attachment (void *message_object, TALLOC_CTX *mem_ctx, void
  NSAutoreleasePool *pool;
  MAPIStoreMessage *message;
  MAPIStoreAttachment *attachment;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -1017,11 +1026,10 @@ sogo_message_create_attachment (void *message_object, TALLOC_CTX *mem_ctx, void
      rc = [message createAttachment: &attachment inAID: aidp];
      if (rc == MAPISTORE_SUCCESS)
        *attachment_object = [attachment tallocWrapper: mem_ctx];
-      // [context tearDownRequest];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1039,9 +1047,7 @@ sogo_message_open_attachment (void *message_object, TALLOC_CTX *mem_ctx,
  NSAutoreleasePool *pool;
  MAPIStoreMessage *message;
  MAPIStoreAttachment *attachment;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -1054,11 +1060,10 @@ sogo_message_open_attachment (void *message_object, TALLOC_CTX *mem_ctx,
      rc = [message getAttachment: &attachment withAID: aid];
      if (rc == MAPISTORE_SUCCESS)
        *attachment_object = [attachment tallocWrapper: mem_ctx];
-      // [context tearDownRequest];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1075,9 +1080,7 @@ sogo_message_get_attachment_table (void *message_object, TALLOC_CTX *mem_ctx, vo
  NSAutoreleasePool *pool;
  MAPIStoreMessage *message;
  MAPIStoreAttachmentTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -1091,11 +1094,10 @@ sogo_message_get_attachment_table (void *message_object, TALLOC_CTX *mem_ctx, vo
                           andRowCount: row_count];
      if (rc == MAPISTORE_SUCCESS)
        *table_object = [table tallocWrapper: mem_ctx];
-      // [context tearDownRequest];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1114,10 +1116,7 @@ sogo_message_modify_recipients (void *message_object,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -1130,11 +1129,10 @@ sogo_message_modify_recipients (void *message_object,
      rc = [message modifyRecipientsWithRecipients: recipients
                                          andCount: count
                                        andColumns: columns];
-      // [context tearDownRequest];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1150,10 +1148,7 @@ sogo_message_set_read_flag (void *message_object, uint8_t flag)
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -1164,11 +1159,10 @@ sogo_message_set_read_flag (void *message_object, uint8_t flag)

      TRYCATCH_START
      rc = [message setReadFlag: flag];
-      // [context tearDownRequest];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1184,10 +1178,7 @@ sogo_message_save (void *message_object, TALLOC_CTX *mem_ctx)
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -1198,11 +1189,10 @@ sogo_message_save (void *message_object, TALLOC_CTX *mem_ctx)

      TRYCATCH_START
      rc = [message saveMessage: mem_ctx];
-      // [context tearDownRequest];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1218,10 +1208,7 @@ sogo_message_submit (void *message_object, enum SubmitFlags flags)
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreMailVolatileMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (message_object)
    {
@@ -1232,11 +1219,10 @@ sogo_message_submit (void *message_object, enum SubmitFlags flags)

      TRYCATCH_START
      rc = [message submitWithFlags: flags];
-      // [context tearDownRequest];
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1257,10 +1243,7 @@ sogo_message_attachment_open_embedded_message (void *attachment_object,
  NSAutoreleasePool *pool;
  MAPIStoreAttachment *attachment;
  MAPIStoreEmbeddedMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (attachment_object)
    {
@@ -1279,7 +1262,7 @@ sogo_message_attachment_open_embedded_message (void *attachment_object,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1299,10 +1282,7 @@ sogo_message_attachment_create_embedded_message (void *attachment_object,
  NSAutoreleasePool *pool;
  MAPIStoreAttachment *attachment;
  MAPIStoreEmbeddedMessage *message;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (attachment_object)
    {
@@ -1320,7 +1300,7 @@ sogo_message_attachment_create_embedded_message (void *attachment_object,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1336,10 +1316,7 @@ static enum mapistore_error sogo_table_get_available_properties(void *table_obje
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (table_object)
    {
@@ -1353,7 +1330,7 @@ static enum mapistore_error sogo_table_get_available_properties(void *table_obje
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1369,10 +1346,7 @@ sogo_table_set_columns (void *table_object, uint16_t count, enum MAPITAGS *prope
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (table_object)
    {
@@ -1387,7 +1361,7 @@ sogo_table_set_columns (void *table_object, uint16_t count, enum MAPITAGS *prope
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1403,10 +1377,7 @@ sogo_table_set_restrictions (void *table_object, struct mapi_SRestriction *restr
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (table_object)
    {
@@ -1423,7 +1394,7 @@ sogo_table_set_restrictions (void *table_object, struct mapi_SRestriction *restr
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1439,10 +1410,7 @@ sogo_table_set_sort_order (void *table_object, struct SSortOrderSet *sort_order,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (table_object)
    {
@@ -1459,7 +1427,7 @@ sogo_table_set_sort_order (void *table_object, struct SSortOrderSet *sort_order,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1477,10 +1445,7 @@ sogo_table_get_row (void *table_object, TALLOC_CTX *mem_ctx,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (table_object)
    {
@@ -1495,7 +1460,7 @@ sogo_table_get_row (void *table_object, TALLOC_CTX *mem_ctx,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1513,10 +1478,7 @@ sogo_table_get_row_count (void *table_object,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (table_object)
    {
@@ -1531,7 +1493,7 @@ sogo_table_get_row_count (void *table_object,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1547,10 +1509,7 @@ sogo_table_handle_destructor (void *table_object, uint32_t handle_id)
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreTable *table;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (table_object)
    {
@@ -1564,8 +1523,8 @@ sogo_table_handle_destructor (void *table_object, uint32_t handle_id)
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
      rc = MAPISTORE_SUCCESS;
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1582,10 +1541,7 @@ static enum mapistore_error sogo_properties_get_available_properties(void *objec
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreObject *propObject;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (object)
    {
@@ -1599,7 +1555,7 @@ static enum mapistore_error sogo_properties_get_available_properties(void *objec
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1618,10 +1574,7 @@ sogo_properties_get_properties (void *object,
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreObject *propObject;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (object)
    {
@@ -1637,7 +1590,7 @@ sogo_properties_get_properties (void *object,
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1653,10 +1606,7 @@ sogo_properties_set_properties (void *object, struct SRow *aRow)
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
  MAPIStoreObject *propObject;
-  int rc;
-
-  OC_DEBUG(5, "[SOGo]");
-
+  enum mapistore_error rc;

  if (object)
    {
@@ -1670,7 +1620,7 @@ sogo_properties_set_properties (void *object, struct SRow *aRow)
      TRYCATCH_END(pool)

      [pool release];
-      NS_CURRENT_THREAD_TRY_UNREGISTER();
+      NS_CURRENT_THREAD_TRY_UNREGISTER(rc);
    }
  else
    {
@@ -1681,18 +1631,16 @@ sogo_properties_set_properties (void *object, struct SRow *aRow)
 }

 static enum mapistore_error
-sogo_manager_generate_uri (TALLOC_CTX *mem_ctx, 
-                           const char *user, 
-                           const char *folder, 
-                           const char *message, 
+sogo_manager_generate_uri (TALLOC_CTX *mem_ctx,
+                           const char *user,
+                           const char *folder,
+                           const char *message,
                           const char *rootURI,
                           char **uri)
 {
  NSAutoreleasePool *pool;
  NSString *partialURLString, *username, *directory;

-  OC_DEBUG(5, "[SOGo]");
-
  if (uri == NULL) return MAPISTORE_ERR_INVALID_PARAMETER;

  /* This fixes a crash occurring during the instantiation of the
@@ -1726,7 +1674,7 @@ sogo_manager_generate_uri (TALLOC_CTX *mem_ctx,
  TRYCATCH_END(pool)

  [pool release];
-  NS_CURRENT_THREAD_TRY_UNREGISTER();
+  NS_CURRENT_THREAD_TRY_UNREGISTER(MAPISTORE_SUCCESS);

  return MAPISTORE_SUCCESS;
 }
@@ -1736,11 +1684,11 @@ sogo_manager_generate_uri (TALLOC_CTX *mem_ctx,

   \return MAPISTORE_SUCCESS on success, otherwise MAPISTORE error
 */
-int mapistore_init_backend(void)
+enum mapistore_error mapistore_init_backend(void)
 {
-  struct mapistore_backend	backend;
-  int				ret;
-  static BOOL                   registered = NO;
+  struct mapistore_backend backend;
+  enum mapistore_error ret;
+  static BOOL registered = NO;

  if (registered)
    ret = MAPISTORE_SUCCESS;
@@ -65,18 +65,18 @@
 - (uint64_t) objectId;

 /* implemented getters */
- (int) getPidTagDisplayName: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagSearchKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagGenerateExchangeViews: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagParentSourceKey: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagSourceKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTagChangeKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagDisplayName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSearchKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagGenerateExchangeViews: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagParentSourceKey: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagSourceKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTagChangeKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx;

 /* subclasses */
 - (uint64_t) objectVersion;
@@ -136,16 +136,16 @@ static Class MAPIStoreFolderK;
 }

 /* getters */
- (int) getPidTagDisplayName: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagDisplayName: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [[sogoObject displayName] asUnicodeInMemCtx: memCtx];

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagSearchKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSearchKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *stringValue;

@@ -156,31 +156,31 @@ static Class MAPIStoreFolderK;
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagGenerateExchangeViews: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagGenerateExchangeViews: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidTagParentSourceKey: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagParentSourceKey: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getReplicaKey: data fromGlobCnt: [container objectId] >> 16
                    inMemCtx: memCtx];
 }

- (int) getPidTagSourceKey: (void **) data
-              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSourceKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getReplicaKey: data fromGlobCnt: [self objectId] >> 16
                    inMemCtx: memCtx];
 }

 /* helper getters */
- (int) getPidTagChangeKey: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagChangeKey: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
  uint64_t obVersion;

  obVersion = [self objectVersion];
@@ -193,10 +193,11 @@ static Class MAPIStoreFolderK;
  return rc;
 }

- (int) getPidTagChangeNumber: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagChangeNumber: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc;
+  enum mapistore_error rc;
+  struct mapistore_connection_info *connInfo;
  uint64_t obVersion;

  obVersion = [self objectVersion];
@@ -204,8 +205,9 @@ static Class MAPIStoreFolderK;
    rc = MAPISTORE_ERR_NOT_FOUND;
  else
    {
+      connInfo = [[self context] connectionInfo];
      *data = MAPILongLongValue (memCtx, ((obVersion << 16)
-                                          | 0x0001));
+                                          | connInfo->repl_id));
      rc = MAPISTORE_SUCCESS;
    }

@@ -25,13 +25,13 @@

@class NSString;

-struct ldb_context;
+#include <mapistore/mapistore.h>

-NSString *MAPIStoreSamDBUserAttribute (struct ldb_context *samCtx,
+NSString *MAPIStoreSamDBUserAttribute (struct mapistore_connection_info *connInfo,
                                       NSString *userKey,
                                       NSString *value,
                                       NSString *attributeName);
-NSData *MAPIStoreInternalEntryId (struct ldb_context *, NSString *username);
+NSData *MAPIStoreInternalEntryId (struct mapistore_connection_info *connInfo, NSString *username);
 NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email);

 #endif /* MAPISTORESAMDBUTILS_H */
@@ -24,13 +24,18 @@
 #import <Foundation/NSString.h>
 #include <talloc.h>
 #include <ldb.h>
+#include <libmapiproxy.h>
+#include <samba/version.h>

 #import "NSData+MAPIStore.h"

 #import "MAPIStoreSamDBUtils.h"

+
+
+
 NSString *
-MAPIStoreSamDBUserAttribute (struct ldb_context *samCtx,
+MAPIStoreSamDBUserAttribute (struct mapistore_connection_info *connInfo,
                             NSString *userKey,
                             NSString *value,
                             NSString *attributeName)
@@ -48,10 +53,20 @@ MAPIStoreSamDBUserAttribute (struct ldb_context *samCtx,
  attrs[0] = [attributeName UTF8String];
  searchFormat
    = [NSString stringWithFormat: @"(&(objectClass=user)(%@=%%s))", userKey];
-  ret = ldb_search (samCtx, memCtx, &res, ldb_get_default_basedn(samCtx),
+#if SAMBA_VERSION_MAJOR <= 4 && SAMBA_VERSION_MINOR < 3
+  ret = ldb_search (connInfo->sam_ctx, memCtx, &res,
+                    ldb_get_default_basedn(connInfo->sam_ctx),
                    LDB_SCOPE_SUBTREE, attrs,
                    [searchFormat UTF8String],
                    [value UTF8String]);
+#else
+  ret = safe_ldb_search (&connInfo->sam_ctx, memCtx, &res,
+                         ldb_get_default_basedn(connInfo->sam_ctx),
+                         LDB_SCOPE_SUBTREE, attrs,
+                         [searchFormat UTF8String],
+                         [value UTF8String]);
+#endif
+
  if (ret == LDB_SUCCESS && res->count == 1)
    {
      result = ldb_msg_find_attr_as_string (res->msgs[0], attrs[0], NULL);
@@ -65,7 +80,7 @@ MAPIStoreSamDBUserAttribute (struct ldb_context *samCtx,
 }

 NSData *
-MAPIStoreInternalEntryId (struct ldb_context *samCtx, NSString *username)
+MAPIStoreInternalEntryId (struct mapistore_connection_info *connInfo, NSString *username)
 {
  static const uint8_t const providerUid[] = { 0xdc, 0xa7, 0x40, 0xc8,
                                               0xc0, 0x42, 0x10, 0x1a,
@@ -82,7 +97,7 @@ MAPIStoreInternalEntryId (struct ldb_context *samCtx, NSString *username)
     type: 32
     X500DN: variable */

-  legacyDN = MAPIStoreSamDBUserAttribute (samCtx, @"sAMAccountName", username,
+  legacyDN = MAPIStoreSamDBUserAttribute (connInfo, @"sAMAccountName", username,
                                          @"legacyExchangeDN");
  if (legacyDN)
    {
@@ -1,6 +1,6 @@
 /* MAPIStoreSharingMessage.h - this file is part of SOGo-OpenChange
 *
- * Copyright (C) 2015 Enrique J. Hernández
+ * Copyright (C) 2015-2016 Enrique J. Hernández
 *
 * Author: Enrique J. Hernández <ejhernandez@zentyal.com>
 *
@@ -39,58 +39,58 @@
               fromMessage: (MAPIStoreMailMessage *) msg;

 /* getters */
- (int) getPidLidSharingCapabilities: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingCapabilities: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingConfigurationUrl: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingConfigUrl: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingFlavor: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingFlavor: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingInitiatorEntryId: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingInitiatorName: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingInitiatorSmtp: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingLocalType: (void **) data
-                         inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingLocalType: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingProviderGuid: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingProviderGuid: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingProviderName: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingProviderName: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingProviderUrl: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingProviderUrl: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingRemoteName: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingRemoteName: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingRemoteStoreUid: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameXSharingRemoteStoreUid: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingRemoteType: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidTypeXSharingRemoteType: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingResponseTime: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidLidSharingResponseType: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getPidNameContentClass: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingCapabilities: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingCapabilities: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingConfigurationUrl: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingConfigUrl: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingFlavor: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingFlavor: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingInitiatorEntryId: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingInitiatorName: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingInitiatorSmtp: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingLocalType: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingLocalType: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingProviderGuid: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingProviderGuid: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingProviderName: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingProviderName: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingProviderUrl: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingProviderUrl: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingRemoteName: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingRemoteName: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingRemoteStoreUid: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameXSharingRemoteStoreUid: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingRemoteType: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidTypeXSharingRemoteType: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingResponseTime: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidLidSharingResponseType: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getPidNameContentClass: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx;

 /* Save */
 - (void) saveWithMessage: (MAPIStoreMailMessage *) msg
@@ -1,6 +1,6 @@
 /* MAPIStoreSharingMessage.m - this file is part of SOGo-OpenChange
 *
- * Copyright (C) 2015 Enrique J. Hernández
+ * Copyright (C) 2015-2016 Enrique J. Hernández
 *
 * Author: Enrique J. Hernández <ejhernandez@zentyal.com>
 *
@@ -108,8 +108,8 @@

 }

- (int) getPidLidSharingCapabilities: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingCapabilities: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {

  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
@@ -125,8 +125,8 @@
  return rc;
 }

- (int) getPidNameXSharingCapabilities: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingCapabilities: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {

  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
@@ -143,22 +143,22 @@
  return rc;
 }

- (int) getPidLidSharingConfigurationUrl: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingConfigurationUrl: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {

  *data = [@"" asUnicodeInMemCtx: memCtx];
  return MAPISTORE_SUCCESS;
 }

- (int) getPidNameXSharingConfigUrl: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingConfigUrl: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingConfigurationUrl: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingFlavor: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingFlavor: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  /* See [MS-OXSHARE] Section 2.2.2.5 for details */
  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
@@ -206,8 +206,8 @@
  return rc;
 }

- (int) getPidNameXSharingFlavor: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingFlavor: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
  id value;
@@ -223,8 +223,8 @@
  return rc;
 }

- (int) getPidLidSharingInitiatorEntryId: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingInitiatorEntryId: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
  id value;
@@ -244,38 +244,38 @@
  return rc;
 }

- (int) getPidLidSharingInitiatorName: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingInitiatorName: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-initiatorname"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidLidSharingInitiatorSmtp: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingInitiatorSmtp: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-initiatorsmtp"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidLidSharingLocalType: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingLocalType: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-localtype"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidNameXSharingLocalType: (void **) data
-                           inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingLocalType: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingLocalType: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingProviderGuid: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingProviderGuid: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  const unsigned char providerGuidBytes[] = {0xAE, 0xF0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
                                             0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46};
@@ -284,15 +284,15 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidNameXSharingProviderGuid: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingProviderGuid: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"AEF0060000000000C000000000000046" asUnicodeInMemCtx: memCtx];
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidSharingProviderName: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingProviderName: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {

  return [self _getStringProperty: @"x-ms-sharing-providername"
@@ -300,84 +300,84 @@
                         inMemCtx: memCtx];
 }

- (int) getPidNameXSharingProviderName: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingProviderName: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingProviderName: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingProviderUrl: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingProviderUrl: (void **) data
+                                            inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-providerurl"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidNameXSharingProviderUrl: (void **) data
-                             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingProviderUrl: (void **) data
+                                              inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingProviderUrl: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingRemoteName: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingRemoteName: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-remotename"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidNameXSharingRemoteName: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingRemoteName: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingRemoteName: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingRemoteStoreUid: (void **) data
-                              inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingRemoteStoreUid: (void **) data
+                                               inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-remotestoreuid"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidNameXSharingRemoteStoreUid: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameXSharingRemoteStoreUid: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingRemoteStoreUid: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingRemoteType: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingRemoteType: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-remotetype"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidTypeXSharingRemoteType: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTypeXSharingRemoteType: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingRemoteType: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingRemoteUid: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingRemoteUid: (void **) data
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self _getStringProperty: @"x-ms-sharing-remoteuid"
                           inData: data
                         inMemCtx: memCtx];
 }

- (int) getPidUidXSharingRemoteUid: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidUidXSharingRemoteUid: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidLidSharingRemoteUid: data inMemCtx: memCtx];
 }

- (int) getPidLidSharingResponseTime: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingResponseTime: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
  id value;
@@ -403,8 +403,8 @@
  return rc;
 }

- (int) getPidLidSharingResponseType: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidSharingResponseType: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {

  enum mapistore_error rc = MAPISTORE_ERR_NOT_FOUND;
@@ -423,8 +423,8 @@
  return rc;
 }

- (int) getPidNameContentClass: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidNameContentClass: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = talloc_strdup (memCtx, "Sharing");
  return MAPISTORE_SUCCESS;
@@ -88,17 +88,17 @@ typedef enum {

 - (void) cleanupCaches;

- (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
-                      inMemCtx: (TALLOC_CTX *) localMemCtx;
+- (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                                       inMemCtx: (TALLOC_CTX *) localMemCtx;
 - (void) setRestrictions: (const struct mapi_SRestriction *) res;
- (int) setColumns: (enum MAPITAGS *) newColumns
-         withCount: (uint16_t) newColumCount;
- (int) getRow: (struct mapistore_property_data **) dataP
-     withRowID: (uint32_t) rowId
-  andQueryType: (enum mapistore_query_type) queryType
-      inMemCtx: (TALLOC_CTX *) memCtx;
- (int) getRowCount: (uint32_t *) countP
-      withQueryType: (enum mapistore_query_type) queryType;
+- (enum mapistore_error) setColumns: (enum MAPITAGS *) newColumns
+                          withCount: (uint16_t) newColumCount;
+- (enum mapistore_error) getRow: (struct mapistore_property_data **) dataP
+                      withRowID: (uint32_t) rowId
+                   andQueryType: (enum mapistore_query_type) queryType
+                       inMemCtx: (TALLOC_CTX *) memCtx;
+- (enum mapistore_error) getRowCount: (uint32_t *) countP
+                       withQueryType: (enum mapistore_query_type) queryType;

 /* helpers */

@@ -366,8 +366,8 @@ static Class NSDataK, NSStringK;
  currentRow = (uint32_t) -1;
 }

- (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
-                      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [[isa childObjectClass] getAvailableProperties: propertiesP
                                               inMemCtx: memCtx];
@@ -749,8 +749,8 @@ static Class NSDataK, NSStringK;
 }

 /* proof of concept */
- (int) setColumns: (enum MAPITAGS *) newColumns
-         withCount: (uint16_t) newColumnsCount
+- (enum mapistore_error) setColumns: (enum MAPITAGS *) newColumns
+                          withCount: (uint16_t) newColumnsCount
 {
  NSUInteger count;

@@ -831,15 +831,15 @@ static Class NSDataK, NSStringK;
  return nil;
 }

- (int) getRow: (struct mapistore_property_data **) dataP
-     withRowID: (uint32_t) rowId
-  andQueryType: (enum mapistore_query_type) queryType
-      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getRow: (struct mapistore_property_data **) dataP
+                      withRowID: (uint32_t) rowId
+                   andQueryType: (enum mapistore_query_type) queryType
+                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSUInteger count;
  MAPIStoreObject *child;
  struct mapistore_property_data *rowData;
-  int rc;
+  enum mapistore_error rc;

  child = [self childAtRowID: rowId forQueryType: queryType];
  if (child)
@@ -858,8 +858,8 @@ static Class NSDataK, NSStringK;
  return rc;
 }

- (int) getRowCount: (uint32_t *) countP
-      withQueryType: (enum mapistore_query_type) queryType
+- (enum mapistore_error) getRowCount: (uint32_t *) countP
+                       withQueryType: (enum mapistore_query_type) queryType
 {
  NSArray *children;

@@ -23,9 +23,9 @@
 #ifndef MAPISTORETASKSFOLDER_H
 #define MAPISTORETASKSFOLDER_H

-#import "MAPIStoreGCSFolder.h"
+#import "MAPIStoreCalTaskFolder.h"

-@interface MAPIStoreTasksFolder : MAPIStoreGCSFolder
+@interface MAPIStoreTasksFolder : MAPIStoreCalTaskFolder

@end

@@ -31,6 +31,7 @@
 #import <Appointments/SOGoTaskObject.h>

 #import "MAPIApplication.h"
+#import "MAPIStoreUserContext.h"
 #import "MAPIStoreTasksContext.h"
 #import "MAPIStoreTasksMessage.h"
 #import "MAPIStoreTasksMessageTable.h"
@@ -61,6 +62,7 @@
  SOGoTaskObject *newEntry;
  NSString *name;

+  [[[self context] userContext] activate];
  name = [NSString stringWithFormat: @"%@.ics",
                   [SOGoObject globallyUniqueObjectId]];
  newEntry = [SOGoTaskObject objectWithName: name
@@ -69,10 +71,14 @@
  newMessage = [MAPIStoreTasksMessage mapiStoreObjectWithSOGoObject: newEntry
                                                        inContainer: self];

-  
+
  return newMessage;
 }

+// --------------------------------------------
+// Permissions and sharing
+// --------------------------------------------
+
 - (NSArray *) rolesForExchangeRights: (uint32_t) rights
 {
  NSMutableArray *roles;
@@ -80,21 +86,34 @@
  roles = [NSMutableArray arrayWithCapacity: 6];
  if (rights & RightsCreateItems)
    [roles addObject: SOGoRole_ObjectCreator];
+
  if (rights & RightsDeleteAll)
    [roles addObject: SOGoRole_ObjectEraser];
+  if (rights & RightsDeleteOwn)
+    [roles addObject: MAPIStoreRightDeleteOwn];
+
  if (rights & RightsEditAll)
    {
      [roles addObject: SOGoCalendarRole_PublicModifier];
      [roles addObject: SOGoCalendarRole_PrivateModifier];
      [roles addObject: SOGoCalendarRole_ConfidentialModifier];
    }
-  else if (rights & RightsReadItems)
+  if (rights & RightsEditOwn)
+    [roles addObject: MAPIStoreRightEditOwn];
+
+  if (rights & RightsReadItems)
    {
      [roles addObject: SOGoCalendarRole_PublicViewer];
      [roles addObject: SOGoCalendarRole_PrivateViewer];
      [roles addObject: SOGoCalendarRole_ConfidentialViewer];
    }

+  if (rights & RightsFolderOwner)
+    [roles addObject: MAPIStoreRightFolderOwner];
+
+  if (rights & RightsFolderContact)
+    [roles addObject: MAPIStoreRightFolderContact];
+
  return roles;
 }

@@ -105,29 +124,74 @@
  if ([roles containsObject: SOGoRole_ObjectCreator])
    rights |= RightsCreateItems;
  if ([roles containsObject: SOGoRole_ObjectEraser])
-    rights |= RightsDeleteAll;
+    rights |= RightsDeleteAll | RightsDeleteOwn;
  if ([roles containsObject: SOGoCalendarRole_PublicModifier]
      && [roles containsObject: SOGoCalendarRole_PrivateModifier]
      && [roles containsObject: SOGoCalendarRole_ConfidentialModifier])
-    rights |= RightsReadItems | RightsEditAll;
+    rights |= RightsReadItems | RightsEditAll | RightsEditOwn;
  else if ([roles containsObject: SOGoCalendarRole_PublicViewer]
           && [roles containsObject: SOGoCalendarRole_PrivateViewer]
           && [roles containsObject: SOGoCalendarRole_ConfidentialViewer])
    rights |= RightsReadItems;
+
+  if ([roles containsObject: MAPIStoreRightEditOwn])
+    rights |= RightsEditOwn;
+  if ([roles containsObject: MAPIStoreRightDeleteOwn])
+    rights |= RightsDeleteOwn;
+
  if (rights != 0)
    rights |= RoleNone; /* actually "folder visible" */
- 
+
+  if ([roles containsObject: MAPIStoreRightFolderOwner])
+    rights |= RightsFolderOwner | RoleNone;
+
+  if ([roles containsObject: MAPIStoreRightFolderContact])
+    rights |= RightsFolderContact;
+
  return rights;
 }

+- (BOOL) subscriberCanModifyMessages
+{
+  static NSArray *modifierRoles = nil;
+
+  if (!modifierRoles)
+    modifierRoles = [[NSArray alloc] initWithObjects:
+                                       SOGoCalendarRole_PublicModifier,
+                                       SOGoCalendarRole_PrivateModifier,
+                                       SOGoCalendarRole_ConfidentialModifier,
+                                       nil];
+
+  return ([[self activeUserRoles] firstObjectCommonWithArray: modifierRoles]
+          != nil);
+}
+
+- (BOOL) subscriberCanReadMessages
+{
+  static NSArray *viewerRoles = nil;
+
+  if (!viewerRoles)
+    viewerRoles = [[NSArray alloc] initWithObjects:
+                                     SOGoCalendarRole_PublicViewer,
+                                     SOGoCalendarRole_PrivateViewer,
+                                     SOGoCalendarRole_ConfidentialViewer,
+                                     nil];
+
+  return ([[self activeUserRoles] firstObjectCommonWithArray: viewerRoles]
+          != nil);
+}
+
 - (EOQualifier *) aclQualifier
 {
  return [EOQualifier qualifierWithQualifierFormat:
            [(SOGoAppointmentFolder *) sogoObject aclSQLListingFilter]];
 }

- (int) getPidTagDefaultPostMessageClass: (void **) data
-                                inMemCtx: (TALLOC_CTX *) memCtx
+// --------------------------------------------
+// Property getters
+// --------------------------------------------
+- (enum mapistore_error) getPidTagDefaultPostMessageClass: (void **) data
+                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = [@"IPM.Task" asUnicodeInMemCtx: memCtx];

@@ -23,9 +23,9 @@
 #ifndef MAPISTORETASKSMESSAGE_H
 #define MAPISTORETASKSMESSAGE_H

-#import "MAPIStoreGCSMessage.h"
+#import "MAPIStoreCalTaskMessage.h"

-@interface MAPIStoreTasksMessage : MAPIStoreGCSMessage
+@interface MAPIStoreTasksMessage : MAPIStoreCalTaskMessage

@end

@@ -68,8 +68,8 @@

@implementation MAPIStoreTasksMessage

- (int) getPidTagIconIndex: (void **) data // TODO
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagIconIndex: (void **) data // TODO
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  /* see http://msdn.microsoft.com/en-us/library/cc815472.aspx */
  // Unassigned recurring task 0x00000501
@@ -83,16 +83,16 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagMessageClass: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageClass: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = talloc_strdup(memCtx, "IPM.Task");

  return MAPISTORE_SUCCESS;
 }

- (int) getPidTagNormalizedSubject: (void **) data // SUMMARY
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagNormalizedSubject: (void **) data // SUMMARY
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
  iCalToDo *task;

@@ -103,10 +103,10 @@
 }

 /* FIXME: Should be combined somehow with the code in MAPIStoreAppointmentWrapper.m */
- (int) getPidTagBody: (void **) data
-             inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagBody: (void **) data
+                              inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSString *stringValue;
  iCalToDo *task;
  
@@ -122,21 +122,32 @@
 }

 /* FIXME: Should be combined somehow with the code in MAPIStoreAppointmentWrapper.m */
- (int) getPidLidPrivate: (void **) data // private (bool), should depend on CLASS and permissions
-                inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidPrivate: (void **) data // private (bool), should depend on CLASS and permissions
+                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
  iCalToDo *task;
  
  task = [sogoObject component: NO secure: YES];

-  if ([task symbolicAccessClass] == iCalAccessPublic)
+  if ([task isPublic])
    return [self getNo: data inMemCtx: memCtx];

  return [self getYes: data inMemCtx: memCtx];
 }

- (int) getPidTagImportance: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagSensitivity: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
+{
+  uint32_t v;
+
+  v = (uint32_t) [self sensitivity];
+
+  *data = MAPILongValue (memCtx, v);
+  return MAPISTORE_SUCCESS;
+}
+
+- (enum mapistore_error) getPidTagImportance: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  uint32_t v;
  iCalToDo *task;
@@ -154,8 +165,11 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidTaskComplete: (void **) data
-                     inMemCtx: (TALLOC_CTX *) memCtx
+//------------------------------------
+// Specific task related properties
+//------------------------------------
+- (enum mapistore_error) getPidLidTaskComplete: (void **) data
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  iCalToDo *task;

@@ -166,8 +180,8 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidPercentComplete: (void **) data
-                        inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidPercentComplete: (void **) data
+                                         inMemCtx: (TALLOC_CTX *) memCtx
 {
  double doubleValue;
  iCalToDo *task;
@@ -180,10 +194,10 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidTaskDateCompleted: (void **) data
-                          inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskDateCompleted: (void **) data
+                                           inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSCalendarDate *dateValue;
  iCalToDo *task;

@@ -198,54 +212,54 @@
  return rc;
 }

- (int) getPidLidTaskState: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskState: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  *data = MAPILongValue (memCtx, 0x1); // not assigned

  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidTaskMode: (void **) data // TODO
-                 inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskMode: (void **) data // TODO
+                                  inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidLidTaskFRecurring: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskFRecurring: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidLidTaskAccepted: (void **) data // TODO
-                     inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskAccepted: (void **) data // TODO
+                                      inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidLidTaskActualEffort: (void **) data // TODO
-                         inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskActualEffort: (void **) data // TODO
+                                          inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidLidTaskEstimatedEffort: (void **) data // TODO
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskEstimatedEffort: (void **) data // TODO
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (int) getPidTagHasAttachments: (void **) data
-                       inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagHasAttachments: (void **) data
+                                        inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getNo: data inMemCtx: memCtx];
 }

- (int) getPidLidTaskDueDate: (void **) data
-                    inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskDueDate: (void **) data
+                                     inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSCalendarDate *dateValue;
  iCalToDo *task;

@@ -259,10 +273,10 @@
  return rc;
 }

- (int) getPidLidTaskStartDate: (void **) data
-		      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskStartDate: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
-  int rc = MAPISTORE_SUCCESS;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
  NSCalendarDate *dateValue;
  iCalToDo *task;

@@ -277,26 +291,26 @@
 }


- (int) getPidTagMessageDeliveryTime: (void **) data
-                            inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidTagMessageDeliveryTime: (void **) data
+                                             inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagLastModificationTime: data inMemCtx: memCtx];
 }

- (int) getClientSubmitTime: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getClientSubmitTime: (void **) data
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagLastModificationTime: data inMemCtx: memCtx];
 }

- (int) getLocalCommitTime: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getLocalCommitTime: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getPidTagLastModificationTime: data inMemCtx: memCtx];
 }

- (int) getPidLidTaskStatus: (void **) data // status
-                   inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskStatus: (void **) data // status
+                                    inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *status;
  uint32_t longValue;
@@ -318,11 +332,12 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidTaskOwner: (void **) data
-                  inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskOwner: (void **) data
+                                   inMemCtx: (TALLOC_CTX *) memCtx
 {
  NSString *owner;

+  /* FIXME: This is wrong when setting task's request */
  owner = [sogoObject ownerInContext: nil];

  *data = [owner asUnicodeInMemCtx: memCtx];
@@ -330,31 +345,51 @@
  return MAPISTORE_SUCCESS;
 }

- (int) getPidLidTaskOwnership: (void **) data
-                      inMemCtx: (TALLOC_CTX *) memCtx
+- (enum mapistore_error) getPidLidTaskOwnership: (void **) data
+                                       inMemCtx: (TALLOC_CTX *) memCtx
 {
  return [self getLongZero: data inMemCtx: memCtx];
 }

- (BOOL) subscriberCanReadMessage
+// ----------------------------------
+// Sharing
+// ----------------------------------
+- (NSUInteger) sensitivity
 {
-  return ([[self activeUserRoles]
-            containsObject: SOGoCalendarRole_ComponentViewer]
-          || [self subscriberCanModifyMessage]);
+  iCalToDo *task;
+  NSUInteger v;
+
+  task = [sogoObject component: NO secure: YES];
+  /* FIXME: Use OpenChange constants names */
+  switch ([task symbolicAccessClass])
+    {
+    case iCalAccessPrivate:
+      v = 0x2;
+      break;
+    case iCalAccessConfidential:
+      v = 0x3;
+      break;
+    default:
+      v = 0x0;
+      break;
+    }
+  return v;
 }

- (BOOL) subscriberCanModifyMessage
+- (NSString *) creator
 {
-  BOOL rc;
-  NSArray *roles = [self activeUserRoles];
+  iCalToDo *task;

-  if (isNew)
-    rc = [roles containsObject: SOGoRole_ObjectCreator];
-  else
-    rc = ([roles containsObject: SOGoCalendarRole_ComponentModifier]
-          || [roles containsObject: SOGoCalendarRole_ComponentResponder]);
+  task = [sogoObject component: NO secure: YES];
+  return [[task uniqueChildWithTag: @"x-sogo-component-created-by"]
+            flattenedValuesForKey: @""];
+}

-  return rc;
+- (NSString *) owner
+{
+  /* This is not true but to allow a user edit its own tasks is required.
+     FIXME: When PidLidTaskOwner getter is properly implemented for Task Requests */
+  return [self creator];
 }

 - (void) save:(TALLOC_CTX *) memCtx
@@ -524,14 +559,20 @@
 	[vToDo setAccessClass: @"PUBLIC"];
    }

+  /* Creation */
  now = [NSCalendarDate date];
  if ([sogoObject isNew])
    {
      [vToDo setCreated: now];
+      /* Creator is used for sharing purposes */
+      value = [properties objectForKey: MAPIPropertyKey (PidTagLastModifierName)];
+      if (value)
+        [[vToDo uniqueChildWithTag: @"x-sogo-component-created-by"] setSingleValue: value
+                                                                            forKey: @""];
    }
  [vToDo setTimeStampAsDate: now];

-  [sogoObject saveComponent: vCalendar];
+  [sogoObject saveCalendar: vCalendar];

  [self updateVersions];
 }