Merge to 2.2.14

Merge to 2.2.13
Merge to 2.2.12a
2015-01-20 08:35:54 -05:00 · 2014-12-30 08:01:52 -05:00 · 2014-12-19 09:04:01 -05:00 · 2014-12-18 08:57:15 -05:00 · 2014-12-10 15:24:12 -05:00 · 2014-12-10 14:25:11 -05:00
1676 changed files with 72867 additions and 101370 deletions
@@ -12,32 +12,20 @@ trans.da_DK = UI/MailerUI/Danish.lproj/Localizable.strings
 trans.de = UI/MailerUI/German.lproj/Localizable.strings
 trans.es_AR = UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/MailerUI/Hebrew.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.lv = UI/MailerUI/Latvian.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_CN = UI/MailerUI/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-preferencesui]
 source_file = UI/PreferencesUI/English.lproj/Localizable.strings
@@ -50,32 +38,20 @@ trans.da_DK = UI/PreferencesUI/Danish.lproj/Localizable.strings
 trans.de = UI/PreferencesUI/German.lproj/Localizable.strings
 trans.es_AR = UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/PreferencesUI/Hebrew.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.lv = UI/PreferencesUI/Latvian.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_CN = UI/PreferencesUI/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-scheduler]
 source_file = UI/Scheduler/English.lproj/Localizable.strings
@@ -88,32 +64,20 @@ trans.da_DK = UI/Scheduler/Danish.lproj/Localizable.strings
 trans.de = UI/Scheduler/German.lproj/Localizable.strings
 trans.es_AR = UI/Scheduler/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/Scheduler/Hebrew.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.lv = UI/Scheduler/Latvian.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_CN = UI/Scheduler/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-contacts]
 source_file = UI/Contacts/English.lproj/Localizable.strings
@@ -126,32 +90,20 @@ trans.da_DK = UI/Contacts/Danish.lproj/Localizable.strings
 trans.de = UI/Contacts/German.lproj/Localizable.strings
 trans.es_AR = UI/Contacts/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/Contacts/Hebrew.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.lv = UI/Contacts/Latvian.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_CN = UI/Contacts/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/Contacts/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-mainui]
 source_file = UI/MainUI/English.lproj/Localizable.strings
@@ -164,32 +116,20 @@ trans.da_DK = UI/MainUI/Danish.lproj/Localizable.strings
 trans.de = UI/MainUI/German.lproj/Localizable.strings
 trans.es_AR = UI/MainUI/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/MainUI/Hebrew.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.lv = UI/MainUI/Latvian.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_CN = UI/MainUI/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/MainUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-common]
 source_file = UI/Common/English.lproj/Localizable.strings
@@ -202,32 +142,20 @@ trans.da_DK = UI/Common/Danish.lproj/Localizable.strings
 trans.de = UI/Common/German.lproj/Localizable.strings
 trans.es_AR = UI/Common/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/Common/Hebrew.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.lv = UI/Common/Latvian.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_CN = UI/Common/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/Common/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-administrationui]
 source_file = UI/AdministrationUI/English.lproj/Localizable.strings
@@ -240,32 +168,20 @@ trans.da_DK = UI/AdministrationUI/Danish.lproj/Localizable.strings
 trans.de = UI/AdministrationUI/German.lproj/Localizable.strings
 trans.es_AR = UI/AdministrationUI/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/AdministrationUI/Hebrew.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.lv = UI/AdministrationUI/Latvian.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_CN = UI/AdministrationUI/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-appointments]
 source_file = SoObjects/Appointments/English.lproj/Localizable.strings
@@ -278,32 +194,20 @@ trans.da_DK = SoObjects/Appointments/Danish.lproj/Localizable.strings
 trans.de = SoObjects/Appointments/German.lproj/Localizable.strings
 trans.es_AR = SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings
 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.he = SoObjects/Appointments/Hebrew.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.lv = SoObjects/Appointments/Latvian.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_CN = SoObjects/Appointments/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-contacts]
 source_file = SoObjects/Contacts/English.lproj/Localizable.strings
@@ -316,32 +220,20 @@ trans.da_DK = SoObjects/Contacts/Danish.lproj/Localizable.strings
 trans.de = SoObjects/Contacts/German.lproj/Localizable.strings
 trans.es_AR = SoObjects/Contacts/SpanishArgentina.lproj/Localizable.strings
 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.he = SoObjects/Contacts/Hebrew.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.lv = SoObjects/Contacts/Latvian.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_CN = SoObjects/Contacts/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings

 [sogo.soobjects-mailer]
 source_file = SoObjects/Mailer/English.lproj/Localizable.strings
@@ -354,32 +246,20 @@ trans.da_DK = SoObjects/Mailer/Danish.lproj/Localizable.strings
 trans.de = SoObjects/Mailer/German.lproj/Localizable.strings
 trans.es_AR = SoObjects/Mailer/SpanishArgentina.lproj/Localizable.strings
 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.he = SoObjects/Mailer/Hebrew.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.lv = SoObjects/Mailer/Latvian.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_CN = SoObjects/Mailer/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings

 [sogo.ui-mailpartviewers]
 source_file = UI/MailPartViewers/English.lproj/Localizable.strings
@@ -392,29 +272,17 @@ trans.da_DK = UI/MailPartViewers/Danish.lproj/Localizable.strings
 trans.de = UI/MailPartViewers/German.lproj/Localizable.strings
 trans.es_AR = UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings
 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.he = UI/MailPartViewers/Hebrew.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.lv = UI/MailPartViewers/Latvian.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_CN = UI/MailPartViewers/ChineseChina.lproj/Localizable.strings
-trans.zh_TW = UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings
@@ -1,27 +0,0 @@
-const tracker = {
-  filename: "Version",
-  updater: require("./Scripts/standard-version-updater.js")
-}
-
-module.exports = {
-  tagPrefix: "SOGo-",
-  issueUrlFormat: "https://www.sogo.nu/bugs/view.php?id={{id}}",
-  compareUrlFormat: "{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}",
-  types: [
-    {type: "feat",     section: "Features"},
-    {type: "refactor", section: "Enhancements"},
-    {type: "perf",     section: "Enhancements"},
-    {type: "i18n",     section: "Localization"},
-    {type: "fix",      section: "Bug Fixes"},
-    {type: "chore",    hidden:  true},
-    {type: "docs",     hidden:  true},
-    {type: "style",    hidden:  true},
-    {type: "test",     hidden:  true}
-  ],
-  skip: {
-    commit: true,
-    tag: true
-  },
-  packageFiles: [tracker],
-  bumpFiles: [tracker]
-}
@@ -1,4 +1 @@
-ifeq ($(HAS_LIBRARY_ssl),yes)
-ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
-BUNDLE_LIBS += -lcrypto
-endif
+# compilation settings
@@ -101,7 +101,7 @@ static NSArray *asElementArray = nil;
  int i, count;
  
  if (!asElementArray)
-    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", @"Exception", nil];
+    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", nil];

  data = [NSMutableDictionary dictionary];

@@ -1,6 +1,6 @@
 /*

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

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

@implementation NGMimeMessage (ActiveSync)

- (void) _addRecipients: (NSEnumerator *) enumerator
-                toArray: (NSMutableArray *) recipients
+- (NSArray *) allRecipients
 {
+  NSEnumerator *enumerator, *addressList;
+  NSMutableArray *recipients;
  NGMailAddressParser *parser;
-  NSEnumerator *addressList;
  NGMailAddress *address;
  NSString *s;

+  recipients = [NSMutableArray array];
+
+  enumerator = [[self headersForKey: @"to"] objectEnumerator];
  while ((s = [enumerator nextObject]))
    {
      parser = [NGMailAddressParser mailAddressParserWithString: s];
@@ -56,22 +59,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      while ((address = [addressList nextObject]))
        [recipients addObject: [address address]];
    }
-}

- (NSArray *) allRecipients
-{
-  NSMutableArray *recipients;
-
-  recipients = [NSMutableArray array];
-
-  [self _addRecipients: [[self headersForKey: @"to"] objectEnumerator]
-               toArray: recipients];
-
-  [self _addRecipients: [[self headersForKey: @"cc"] objectEnumerator]
-               toArray: recipients];
-
-  [self _addRecipients: [[self headersForKey: @"bcc"] objectEnumerator]
-               toArray: recipients];
+  enumerator = [[self headersForKey: @"cc"] objectEnumerator];
+  while ((s = [enumerator nextObject]))
+    {
+      parser = [NGMailAddressParser mailAddressParserWithString: s];
+      addressList = [[parser parseAddressList] objectEnumerator];
+      
+      while ((address = [addressList nextObject]))
+        [recipients addObject: [address address]];
+    }

  return recipients;
 }
@@ -46,50 +46,13 @@ 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;
-  NSMutableArray *other_addresses;
-  CardElement *n, *homeAdr, *workAdr, *otherAdr;
-  NSMutableString *s, *a;
+  CardElement *n, *homeAdr, *workAdr;
+  NSMutableString *s;
  NSString *url;
  id o;

@@ -100,7 +63,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]];
  
@@ -143,7 +106,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 activeSyncRepresentationInContext: context]];
+    [s appendFormat: @"<Email1Address xmlns=\"Contacts:\">%@</Email1Address>", o];
  
  
  // Secondary email addresses (2 and 3)
@@ -153,7 +116,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 activeSyncRepresentationInContext: context], i+2];
+      [s appendFormat: @"<Email%dAddress xmlns=\"Contacts:\">%@</Email%dAddress>", i+2, o, i+2];

      if (i == 1)
        break;
@@ -183,22 +146,16 @@ 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: @""]))
-        [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>", [o activeSyncRepresentationInContext: context]];
      
-      [s appendFormat: @"<HomeStreet xmlns=\"Contacts:\">%@</HomeStreet>", a];
-
      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]];
      
@@ -214,15 +171,9 @@ 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: @""]))
-        [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];
+        [s appendFormat: @"<BusinessStreet xmlns=\"Contacts:\">%@</BusinessStreet>", [o activeSyncRepresentationInContext: context]];
      
      if ((o = [workAdr flattenedValueAtIndex: 3  forKey: @""]))
        [s appendFormat: @"<BusinessCity xmlns=\"Contacts:\">%@</BusinessCity>", [o activeSyncRepresentationInContext: context]];
@@ -237,48 +188,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        [s appendFormat: @"<BusinessCountry xmlns=\"Contacts:\">%@</BusinessCountry>", [o activeSyncRepresentationInContext: context]];
    }

-
-  // Other Address
-
-  other_addresses = [[self childrenWithTag: @"adr"] mutableCopy];
-  [other_addresses removeObjectsInArray: [self childrenWithTag: @"adr" andAttribute: @"type" havingValue: @"work"]];
-  [other_addresses removeObjectsInArray: [self childrenWithTag: @"adr" andAttribute: @"type" havingValue: @"home"]];
-
-  if ([other_addresses count])
-    {
-      otherAdr = [other_addresses objectAtIndex: 0];
-      a = [NSMutableString string];
-
-      if ((o = [otherAdr flattenedValueAtIndex: 2  forKey: @""]))
-        [a appendString: [o activeSyncRepresentationInContext: context]];
-
-      if ((o = [otherAdr flattenedValueAtIndex: 1  forKey: @""]) && [o length])
-        [a appendFormat: @"\n%@", [o activeSyncRepresentationInContext: context]];
-
-      [s appendFormat: @"<OtherStreet xmlns=\"Contacts:\">%@</OtherStreet>", a];
-
-      if ((o = [otherAdr flattenedValueAtIndex: 3  forKey: @""]))
-        [s appendFormat: @"<OtherCity xmlns=\"Contacts:\">%@</OtherCity>", [o activeSyncRepresentationInContext: context]];
-
-      if ((o = [otherAdr flattenedValueAtIndex: 4  forKey: @""]))
-        [s appendFormat: @"<OtherState xmlns=\"Contacts:\">%@</OtherState>", [o activeSyncRepresentationInContext: context]];
-
-      if ((o = [otherAdr flattenedValueAtIndex: 5  forKey: @""]))
-        [s appendFormat: @"<OtherPostalCode xmlns=\"Contacts:\">%@</OtherPostalCode>", [o activeSyncRepresentationInContext: context]];
-
-      if ((o = [otherAdr flattenedValueAtIndex: 6  forKey: @""]))
-        [s appendFormat: @"<OtherCountry xmlns=\"Contacts:\">%@</OtherCountry>", [o activeSyncRepresentationInContext: context]];
-    }
-
  // Other, less important fields
  if ((o = [self birthday]))
-    {
-      [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>",
-         [[o dateByAddingYears: 0 months: 0 days: 0
-                         hours: -12 minutes: 0
-                       seconds: 0]
-              activeSyncRepresentationInContext: context]];
-    }
+    [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>", [o activeSyncRepresentationInContext: context]];

  if ((o = [self note]))
    {
@@ -305,7 +217,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                    inContext: (WOContext *) context
 {
  CardElement *element;
-  NSMutableArray *addressLines, *other_addresses;
  id o;
  
  // Contact's note
@@ -315,8 +226,6 @@ 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"]))
@@ -324,11 +233,6 @@ 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
@@ -340,48 +244,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // BusinessCountry
  //
  element = [self elementWithTag: @"adr" ofType: @"work"];
-
-  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: @""];
-    }
+  [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: @""];

  //
  // Home address information
@@ -393,126 +267,35 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // HomeCountry
  //
  element = [self elementWithTag: @"adr" ofType: @"home"];
-
-  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: @""];
-    }
-
-   // OtherCountry
-   //
-
-  other_addresses = [[self childrenWithTag: @"adr"] mutableCopy];
-  [other_addresses removeObjectsInArray: [self childrenWithTag: @"adr" andAttribute: @"type" havingValue: @"work"]];
-  [other_addresses removeObjectsInArray: [self childrenWithTag: @"adr" andAttribute: @"type" havingValue: @"home"]];
-
-  if ([other_addresses count])
-    element = [other_addresses objectAtIndex: 0];
-  else
-    {
-      element = [CardElement elementWithTag: @"adr"];
-      [self addChild: element];
-    }
-
-  if ((o = [theValues objectForKey: @"OtherStreet"]) || ![self _isGhosted: @"OtherStreet" 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: @"OtherCity"]) || ![self _isGhosted: @"OtherCity" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"OtherCity"]
-                      atIndex: 3 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"OtherState"]) || ![self _isGhosted: @"OtherState" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"OtherState"]
-                      atIndex: 4 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"OtherPostalCode"]) || ![self _isGhosted: @"OtherPostalCode" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"OtherPostalCode"]
-                      atIndex: 5 forKey: @""];
-    }
-
-  if ((o = [theValues objectForKey: @"OtherCountry"]) || ![self _isGhosted: @"OtherCountry" inContext: context])
-    {
-      [element setSingleValue: [theValues objectForKey: @"OtherCountry"]
-                      atIndex: 6 forKey: @""];
-    }
+  [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: @""];

  // 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"]) || ![self _isGhosted: @"Email1Address" inContext: context])
+  if ((o = [theValues objectForKey: @"Email1Address"]))
    {
      element = [self elementWithTag: @"email" ofType: @"work"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
    }
  
-  if ((o = [theValues objectForKey: @"Email2Address"]) || ![self _isGhosted: @"Email2Address" inContext: context])
+  if ((o = [theValues objectForKey: @"Email2Address"]))
    {
      element = [self elementWithTag: @"email" ofType: @"home"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
@@ -520,7 +303,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"]) || ![self _isGhosted: @"Email3Address" inContext: context])
+  if ((o = [theValues objectForKey: @"Email3Address"]))
    {
      element = [self elementWithTag: @"email" ofType: @"three"];
      [element setSingleValue: [o pureEMailAddress] forKey: @""];
@@ -530,62 +313,45 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // MiddleName
  // Suffix   (II)
  // Title    (Mr.)
-  if ((o = [theValues objectForKey: @"FileAs"]) || ![self _isGhosted: @"FileAs" inContext: context])
-    [self setFn: [theValues objectForKey: @"FileAs"]];
+  [self setFn: [theValues objectForKey: @"FileAs"]];

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

  //
  // Phone numbrrs
  //
-  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: @"work"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessPhoneNumber"]  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: @"home"];
+  [element setSingleValue: [theValues objectForKey: @"HomePhoneNumber"]  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: @"cell"];
+  [element setSingleValue: [theValues objectForKey: @"MobilePhoneNumber"]  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: @"fax"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessFaxNumber"]  forKey: @""];

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

  if ((o = [theValues objectForKey: @"Picture"]))
@@ -32,10 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSString.h>

-#import <SOGo/SOGoSystemDefaults.h>
-
 #import <NGExtensions/NGBase64Coding.h>
-#import <NGExtensions/NSObject+Logs.h>

 #include <wbxml/wbxml.h>
 #include <wbxml/wbxml_conv.h>
@@ -47,18 +44,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 - (void) _dumpToFile
 {
-  BOOL debugOn;
+  NSString *path;

-  debugOn = [[SOGoSystemDefaults sharedSystemDefaults] easDebugEnabled];
-
-  if (debugOn)
-    {
-      NSString *path;
-
-      path = [NSString stringWithFormat: @"/tmp/%@.data", [[NSProcessInfo processInfo] globallyUniqueString]];
-      [self writeToFile: path  atomically: YES];
-      [self errorWithFormat: @"Original data written to: %@", path];
-    }
+  path = [NSString stringWithFormat: @"/tmp/%@.data", [[NSProcessInfo processInfo] globallyUniqueString]];
+  [self writeToFile: path  atomically: YES];
+  NSLog(@"Original data written to: %@", path);
 }

 //
@@ -66,33 +56,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // 
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
-  NSString *tmp, *s;
-  unichar *buf, *start, c;
-  int len, i, j;
-
-  tmp = [self stringByEncodingBase64] ;
-
-  len = [tmp length];
-
-  start = buf = (unichar *)malloc(len*sizeof(unichar));
-  [tmp getCharacters: buf range: NSMakeRange(0, len)];
-
-  for (i = 0, j = 0; i < len; i++)
-    {
-      c = *buf;
-
-      if (!(c == 0xA))
-        {
-          *(start+j) = c;
-          j++;
-        }
-
-      buf++;
-    }
-
-  s = [[NSString alloc] initWithCharactersNoCopy: start  length: j  freeWhenDone: YES];
-
-  return AUTORELEASE(s);
+  return [[self stringByEncodingBase64] stringByReplacingString: @"\n" withString: @""];
 }

 - (NSData *) wbxml2xml
@@ -117,7 +81,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  if (ret != WBXML_OK)
    {
-      [self errorWithFormat: @"wbxml2xmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
+      NSLog(@"wbxml2xmlFromContent: failed: %s\n", wbxml_errors_string(ret));
      [self _dumpToFile];
      return nil;
    }
@@ -150,7 +114,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  if (ret != WBXML_OK)
    {
-      [self logWithFormat: @"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
      [self _dumpToFile];
      return nil;
    }
@@ -165,7 +129,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  if (ret != WBXML_OK)
    {
-      [self errorWithFormat: @"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret)];
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
      [self _dumpToFile];
      free(wbxml);
      wbxml_conv_xml2wbxml_destroy(conv);
@@ -1,6 +1,6 @@
 /*

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

 Redistribution and use in source and binary forms, with or without
@@ -49,11 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (NSString *) deviceType;
 - (NSString *) attachmentName;
 - (NSString *) command;
- (NSString *) collectionid;
- (NSString *) itemid;
- (BOOL) acceptsMultiPart;
 - (NSData *) convertHexStringToBytes;
- (NSString *) protocolVersion;

@end

@@ -65,7 +65,11 @@ static NSArray *easCommandParameters = nil;

 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
-  return [self safeStringByEscapingXMLString: YES];
+  NSString *s;
+
+  s = [self safeString];
+
+  return [s stringByEscapingHTMLString];
 }

 - (int) activeSyncFolderType
@@ -138,31 +142,6 @@ 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];
-
-      if (![queryString length])
-        return nil;
-
-      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;
@@ -203,11 +182,6 @@ static NSArray *easCommandParameters = nil;

      // Command code, 1 byte, ie.: cmd=
      cmd_code = qs_bytes[1];
-
-      // Check whether the command code is within the known range.
-      if (cmd_code < 0 || cmd_code > 22)
-        return nil;
-
      [components addObject: [NSString stringWithFormat: @"cmd=%@", [easCommandCodes objectAtIndex: cmd_code]]];

      // Device ID length and Device ID (variable)
@@ -324,43 +298,6 @@ static NSArray *easCommandParameters = nil;
  return s;
 }

- (NSString *) itemid
-{
-  NSString *s;
-
-  s = [self _valueForParameter: @"ITEMID="];
-
-  if (!s)
-    s = @"Unknown";
-
-  return s;
-}
-
- (NSString *) collectionid
-{
-  NSString *s;
-
-  s = [self _valueForParameter: @"COLLECTIONID="];
-
-  if (!s)
-    s = @"Unknown";
-
-  return s;
-}
-
- (BOOL) acceptsMultiPart
-{
-  NSString *s;
-
-  s = [self _valueForParameter: @"OPTIONS="];
-
-  if (s && [s rangeOfString: @"AcceptMultiPart" options: NSCaseInsensitiveSearch].location != NSNotFound)
-    return YES;
-
-  return NO;
-}
-
-
 //
 // FIXME: combine with our OpenChange code.
 //
@@ -1,6 +1,6 @@
 /*

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

 Redistribution and use in source and binary forms, with or without
@@ -31,26 +31,15 @@ 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;

@@ -63,6 +52,5 @@ static volatile BOOL easShouldTerminate = NO;

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

@end
@@ -42,8 +42,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
 - (void) takeActiveSyncValues: (NSDictionary *) theValues
                    inContext: (WOContext *) context;
- (NSString *) storeMail: (NSDictionary *) theValues
-               inContext: (WOContext *) _context;

@end

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

@interface SOGoSyncCacheObject : NSObject
 {
-  @public
  id _uid;
  id _sequence;
 }
@@ -32,17 +32,9 @@ 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]))
@@ -54,14 +46,14 @@ static Class NSNullK;
  return self;
 }

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

  o = [[self alloc] init];
-
-  [o setUID: [NSNumber numberWithInt: [theUID intValue]]];
-  [o setSequence: ([theSequence isKindOfClass: NSNullK] ? theSequence : [NSNumber numberWithInt: [theSequence intValue]])];
+ 
+  [o setUID: theUID];
+  [o setSequence: theSequence];
  
  return [o autorelease];
 }
@@ -75,7 +67,7 @@ static Class NSNullK;

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

 - (void) setUID: (id) theUID
@@ -85,7 +77,7 @@ static Class NSNullK;

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

 - (void) setSequence: (id) theSequence
@@ -96,7 +88,7 @@ static Class NSNullK;

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

 //
@@ -105,21 +97,21 @@ static Class NSNullK;
 //
 - (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
@@ -128,4 +120,3 @@ static Class NSNullK;
 }

@end
-
@@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [response setHeader: @"private"  forKey: @"Cache-Control"];
      [response setHeader: @"OPTIONS, POST"  forKey: @"Allow"];
      [response setHeader: @"14.1"  forKey: @"MS-Server-ActiveSync"];
-      [response setHeader: @"2.5,12.0,12.1,14.0,14.1"  forKey: @"MS-ASProtocolVersions"];
+      [response setHeader: @"2.0,2.1,2.5,12.0,12.1,14.0,14.1"  forKey: @"MS-ASProtocolVersions"];
      [response setHeader: @"Sync,SendMail,SmartForward,SmartReply,GetAttachment,GetHierarchy,CreateCollection,DeleteCollection,MoveCollection,FolderSync,FolderCreate,FolderDelete,FolderUpdate,MoveItems,GetItemEstimate,MeetingResponse,Search,Settings,Ping,ItemOperations,ResolveRecipients,ValidateCert"  forKey: @"MS-ASProtocolCommands"];
      [response setHeader: @"OPTIONS, POST"  forKey: @"Public"];
    }
@@ -39,9 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <NGCards/iCalAlarm.h>
 #import <NGCards/iCalEvent.h>
 #import <NGCards/iCalTrigger.h>
-#import <NGCards/NSCalendarDate+NGCards.h>
-
-#include "NSDate+ActiveSync.h"

@implementation iCalAlarm (ActiveSync)

@@ -59,16 +56,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      nextAlarmDate = [self nextAlarmDate];
      delta = (int)(([[(iCalEvent *)parent startDate] timeIntervalSince1970] - [nextAlarmDate timeIntervalSince1970])/60);
      
-      if ([parent isKindOfClass: [iCalEvent class]])
-        {
-          // don't send negative reminder - not supported
-          if (delta > 0)
-            [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", (int)delta];
-        }
-      else
-        {
-          [s appendFormat: @"<ReminderTime xmlns=\"Task:\">%@</ReminderTime>", [nextAlarmDate activeSyncRepresentationInContext: context]];
-        }
+      // don't send negative reminder - not supported
+      if (delta > 0)
+        [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", delta];
    }
  
  return s;
@@ -80,47 +70,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  iCalTrigger *trigger;
  id o;

-  if ((o = [theValues objectForKey: @"Reminder"]))
+  o = [theValues objectForKey: @"Reminder"];
+
+  // Outlook: if reminder is set to 0 minutes before start save it as 1 minute since -> 0 minutes in not accepted by SOGo
+  if ([o isEqualToString: @"0"]) 
+    o = @"1";
+  
+  trigger = [iCalTrigger elementWithTag: @"TRIGGER"];
+  [trigger setValueType: @"DURATION"];
+  [self setTrigger: trigger];
+  [self setAction: @"DISPLAY"];
+
+  // SOGo web ui only supports 1w but not 2w (custom reminder only supports min/hours/days)
+  // 1week = -P1W
+  // 2weeks > -PxD
+  // xdays > -PxD
+  // xhours -> -PTxH
+  // xmin -> -PTxM
+  if  ([o intValue] == 10080)
+    [trigger setSingleValue: [NSString stringWithFormat: @"-P1W" ] forKey: @""];
+  else
    {
-      // Outlook: if reminder is set to 0 minutes before starttime, save it as 1 minute since -> 0 minutes in not accepted by SOGo
-      if ([o isEqualToString: @"0"])
-        o = @"1";
-
-      trigger = [iCalTrigger elementWithTag: @"TRIGGER"];
-      [trigger setValueType: @"DURATION"];
-      [self setTrigger: trigger];
-      [self setAction: @"DISPLAY"];
-
-      // SOGo web ui only supports 1w but not 2w (custom reminder only supports min/hours/days)
-      // 1week = -P1W
-      // 2weeks > -PxD
-      // xdays > -PxD
-      // xhours -> -PTxH
-      // xmin -> -PTxM
-      if  ([o intValue] == 10080)
-        [trigger setSingleValue: [NSString stringWithFormat: @"-P1W" ] forKey: @""];
+      if (([o intValue] % 1440) == 0)
+        [trigger setSingleValue: [NSString stringWithFormat: @"-P%dD", ([o intValue] / 1440)]  forKey: @""];
      else
        {
-          if (([o intValue] % 1440) == 0)
-            [trigger setSingleValue: [NSString stringWithFormat: @"-P%dD", ([o intValue] / 1440)]  forKey: @""];
+          if (([o intValue] % 60) == 0)
+            [trigger setSingleValue: [NSString stringWithFormat: @"-PT%dH", ([o intValue] / 60)]  forKey: @""];
          else
-            {
-              if (([o intValue] % 60) == 0)
-                [trigger setSingleValue: [NSString stringWithFormat: @"-PT%dH", ([o intValue] / 60)]  forKey: @""];
-              else
-                [trigger setSingleValue: [NSString stringWithFormat: @"-PT%@M", o]  forKey: @""];
-            }
+            [trigger setSingleValue: [NSString stringWithFormat: @"-PT%@M", o]  forKey: @""];
        }
    }
-  else if ((o = [theValues objectForKey: @"ReminderTime"]))
-    {
-      o = [o calendarDate];
-      trigger = [iCalTrigger elementWithTag: @"TRIGGER"];
-      [trigger setValueType: @"DATE-TIME"];
-      [trigger setSingleValue: [NSString stringWithFormat: @"%@Z", [o iCalFormattedDateTimeString]] forKey: @""];
-      [self setTrigger: trigger];
-      [self setAction: @"DISPLAY"];
-    }
 }

@end
@@ -41,9 +41,7 @@ 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,26 +38,17 @@ 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>

 #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"
@@ -70,7 +61,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;
@@ -82,29 +73,6 @@ 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;
@@ -129,13 +97,10 @@ 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] && !tz)
+      if ([self isAllDay])
        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>",
           [[[self startDate] dateByAddingYears: 0 months: 0 days: 0
                                          hours: 0 minutes: 0
@@ -148,7 +113,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] && !tz)
+      if ([self isAllDay])
        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>",
           [[[self endDate] dateByAddingYears: 0 months: 0 days: 0
                                        hours: 0 minutes: 0
@@ -158,24 +123,26 @@ 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]];

-  if (![self recurrenceId])
-    [s appendFormat: @"<TimeZone xmlns=\"Calendar:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
+  [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 (![self recurrenceId] && [o length])
+      if ([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 activeSyncRepresentationInContext: context]];
+            [s appendFormat: @"<Organizer_Name xmlns=\"Calendar:\">%@</Organizer_Name>", o];
        }
    }
  
@@ -213,7 +180,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
   else
    {
-      meetingStatus = 0;  // The event is an appointment, which has no attendees.
+      meetingStatus = 0;  // appointment
    }
  
  // This depends on the 'NEEDS-ACTION' parameter.
@@ -234,13 +201,7 @@ 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 (i.e. with no organizer/attendee) or we are the organizer of an event
-      // invitation, we set the busy status depending on TRANSP.
-      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>", (([self isOpaque]) ? 2 : 0)];
+      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>", 2];
    }

  [s appendFormat: @"<MeetingStatus xmlns=\"Calendar:\">%d</MeetingStatus>", meetingStatus];
@@ -251,12 +212,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  // Location
  if ([[self location] length])
-    {
-      if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 16.0)
-        [s appendFormat: @"<Location xmlns=\"AirSyncBase:\"><DisplayName>%@</DisplayName></Location>", [[self location] activeSyncRepresentationInContext: context]];
-      else
-         [s appendFormat: @"<Location xmlns=\"Calendar:\">%@</Location>", [[self location] activeSyncRepresentationInContext: context]];
-    }
+    [s appendFormat: @"<Location xmlns=\"Calendar:\">%@</Location>", [[self location] activeSyncRepresentationInContext: context]];
  
  // Importance - NOT SUPPORTED - DO NOT ENABLE
  //o = [self priority];
@@ -269,37 +225,9 @@ 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 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 objectForKey: @"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>"];
-       }
-    }
-
+  if ([[self uid] length])
+    [s appendFormat: @"<UID xmlns=\"Calendar:\">%@</UID>", [self uid]];
+  
  // Sensitivity
  if ([[self accessClass] isEqualToString: @"PRIVATE"])
    v = 2;
@@ -322,6 +250,7 @@ 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]) 
@@ -332,79 +261,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendString: [alarm activeSyncRepresentationInContext: context]];
    }

-  // Exceptions
+  // Recurrence rules
  if ([self isRecurrent])
    {
-      NSMutableArray *components, *exdates;
-      iCalEvent *current_component;
-      NSString *recurrence_id;
-
-      unsigned int count, max, i;
-
-      components = [NSMutableArray arrayWithArray: [[self parent] events]];
-      max = [components count];
-
-      if (max > 1 || [self hasExceptionDates])
-        {
-          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>"];
-        }
+      [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
    }

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

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

  BOOL isAllDay;
-
-  NSMutableArray *occurences;
-
-  occurences = [NSMutableArray arrayWithArray: [[self parent] events]];
-
-  if ((o = [theValues objectForKey: ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 16.0) ? @"ClientUid" : @"UID"]))
+  
+  if ((o = [theValues objectForKey: @"UID"]))
    [self setUid: o];
    
  // FIXME: merge with iCalToDo
@@ -475,21 +346,13 @@ 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
  //
  if ((o = [theValues objectForKey: @"BusyStatus"]))
    {
-      if ([o boolValue])
-        [self setTransparency: @"OPAQUE"];
-      else
-        [self setTransparency: @"TRANSPARENT"];
+      [o intValue];
    }

  //
@@ -531,34 +394,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
  
  // FIXME: merge with iCalToDo
-  if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
-    {
-      if ((o = [theValues objectForKey: @"Body"]))
-        [self setComment: o];
-    }
-  else
-    {
-      if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
-        [self setComment: o];
-    }
-
-  if ([[context objectForKey: @"ASProtocolVersion"] floatValue] < 16.0 && (o = [theValues objectForKey: @"Location"]))
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
+  if ((o = [theValues objectForKey: @"Location"]))
    [self setLocation: o];
-  else if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 16.0 && (o = [theValues objectForKey: @"Location"]) && [o isKindOfClass: [NSDictionary class]])
-    [self setLocation: [o objectForKey: @"DisplayName"]];
-
-  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];
        }
@@ -566,10 +415,6 @@ 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"]))
@@ -596,7 +441,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      // Ignore the alarm for now
    }
-  else if ((o = [theValues objectForKey: @"Reminder"]) && [o length])
+  else if ((o = [theValues objectForKey: @"Reminder"]))
    {           
      // NOTE: Outlook sends a 15 min reminder (18 hour for allday) if no reminder is specified  
      // although no default reminder is defined (File -> Options -> Clendar -> Calendar Options - > Default Reminders)
@@ -619,7 +464,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
  
  // Recurrence
-  if ((o = [theValues objectForKey: @"Recurrence"]) && [o isKindOfClass: [NSDictionary class]])
+  if ((o = [theValues objectForKey: @"Recurrence"]))
    {
      iCalRecurrenceRule *rule;
      
@@ -628,177 +473,6 @@ 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
@@ -806,7 +480,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"]];
@@ -814,14 +488,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [self setOrganizer: person];
    }

+  //
+  // iOS is plain stupid here. It seends event invitations with no Organizer.
+  // We check this corner-case and if MeetingStatus == 1 (see http://msdn.microsoft.com/en-us/library/ee219342(v=exchg.80).aspx or details)
+  // and there's no organizer, we fake one.
+  //
  if ((o = [theValues objectForKey: @"MeetingStatus"]))
    {
-     //
-     // iOS is plain stupid here. It seends event invitations with no Organizer.
-     // We check this corner-case and if MeetingStatus == 1 (see http://msdn.microsoft.com/en-us/library/ee219342(v=exchg.80).aspx or details)
-     // and there's no organizer, we fake one.
-     //
-      if ([o intValue] == 1 && ![theValues objectForKey: @"Organizer_Email"] && ![[[self organizer] rfc822Email] length])
+      if ([o intValue] == 1 && ![theValues objectForKey: @"Organizer_Email"])
        {
          iCalPerson *person;
      
@@ -831,29 +505,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          [person setPartStat: @"ACCEPTED"];
          [self setOrganizer: person];
        }
-
-      //
-      // When MeetingResponse fails Outlook still sends a new calendar entry with MeetingStatus=3.
-      // Use the organizer from the request if the event has no organizer.
-      //
-      if ([o intValue] == 3 && [theValues objectForKey: @"Organizer_Email"] && ![[[self organizer] rfc822Email] length])
-        {
-          iCalPerson *person;
-          person = [iCalPerson elementWithTag: @"organizer"];
-          [person setEmail: [theValues objectForKey: @"Organizer_Email"]];
-          [person setCn: [theValues objectForKey: @"Organizer_Name"]];
-          [person setPartStat: @"ACCEPTED"];
-          [self setOrganizer: person];
-        }
    }
  
+
  // Attendees - we don't touch the values if we're an attendee. This is gonna
  // be done automatically by the ActiveSync client when invoking MeetingResponse.
  if (![self userIsAttendee: [context activeUser]])
    {
      // 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;
@@ -871,7 +532,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              person = [iCalPerson elementWithTag: @"attendee"];
              [person setCn: [attendee objectForKey: @"Attendee_Name"]];
              [person setEmail: [attendee objectForKey: @"Attendee_Email"]];
-
+              
              status = [[attendee objectForKey: @"Attendee_Status"] intValue];
              
              switch (status)
@@ -888,10 +549,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                case 0:
                case 5:
                default:
-		  {
-		    [person setPartStat: @"NEEDS-ACTION"];
-		    [person setRsvp: @"TRUE"];
-		  }
+                  [person setPartStat: @"NEEDS-ACTION"];
                  break;
                }
              
@@ -903,40 +561,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          [self setAttendees: attendees];
        }
    }
-
-  [self setLastModified: [NSCalendarDate calendarDate]];
-}
-
- (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
@@ -35,42 +35,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <Foundation/NSString.h>

 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalToDo.h>
 #import <NGCards/iCalByDayMask.h>

-#import <NGCards/iCalDateTime.h>
-#import <NGCards/iCalTimeZone.h>
-
 #import "NSCalendarDate+ActiveSync.h"
 #import "NSDate+ActiveSync.h"

@implementation iCalRecurrenceRule (ActiveSync)

- (NSCalendarDate *) _adjustedStartDate
-{
-  iCalTimeZone *timeZone;
-
-  timeZone = [(iCalDateTime *)[[self parent] firstChildWithTag: @"dtstart"] timeZone];
-  if (timeZone)
-    return [timeZone computedDateForDate: [[self parent] startDate]];
-  else
-    return [[self parent] startDate];
-}
-
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
  NSMutableString *s;
-  NSString *t;
  int type;

  s = [NSMutableString string];
-
-  if ([[self parent] isKindOfClass: [iCalToDo class]])
-    t = @"Tasks";
-  else
-    t = @"Calendar";
-
-  [s appendFormat: @"<Recurrence xmlns=\"%@:\">", t];
+  
+  [s appendString: @"<Recurrence xmlns=\"Calendar:\">"];

  // 0 -> daily, 1 -> weekly, 2 -> montly, 5 -> yearly
  type = 0;
@@ -82,11 +61,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      // 1 -> sunday, 2 -> monday, 4 -> tuesday, 8 -> wednesday, 16 -> thursday, 32 -> friday, 64 -> saturday, 127 -> last day of month (montly or yearl recurrences only)
      if ([[self byDayMask] isWeekDays])
        {
-          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (2|4|8|16|32)];
+          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (2|4|8|16|32)];
        }
      else
        {
-          [s appendFormat: @"<Recurrence_Interval xmlns=\"%@:\">%d</Recurrence_Interval>", t, [self repeatInterval]];
+          [s appendFormat: @"<Recurrence_Interval xmlns=\"Calendar:\">%d</Recurrence_Interval>", [self repeatInterval]]; 
        }
    }
  else if ([self frequency] == iCalRecurrenceFrequenceWeekly)
@@ -111,11 +90,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        {
          // No byDayMask, we take the event's start date to compute the DayOfWeek
          // 0 == Sunday, 6 == Saturday
-          v = (1 << [[self _adjustedStartDate] dayOfWeek]);
+          v = (1 << [[[self parent] startDate] dayOfWeek]);
        }

-      [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, v];
-      [s appendFormat: @"<Recurrence_Interval xmlns=\"%@:\">%d</Recurrence_Interval>", t, [self repeatInterval]];
+      [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", v];
+      [s appendFormat: @"<Recurrence_Interval xmlns=\"Calendar:\">%d</Recurrence_Interval>", [self repeatInterval]]; 
    }
  else if ([self frequency] == iCalRecurrenceFrequenceMonthly)
    {
@@ -132,9 +111,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          if (firstOccurrence < 0)
            firstOccurrence = 5;

-          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (1 << [dm firstDay])];
-          [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"%@:\">%d</Recurrence_WeekOfMonth>", t, firstOccurrence];
-	  [s appendFormat: @"<Recurrence_Interval xmlns=\"%@:\">%d</Recurrence_Interval>", t, [self repeatInterval]];
+          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];          
+          [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", firstOccurrence];
        }
      else if ([[self byMonthDay] count])
        {
@@ -148,9 +126,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              iCalByDayMask *dm;
          
              dm = [self byDayMask];
-              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (1 << [dm firstDay])];
-              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"%@:\">%d</Recurrence_WeekOfMonth>", t, 5];
-	      [s appendFormat: @"<Recurrence_Interval xmlns=\"%@:\">%d</Recurrence_Interval>", t, [self repeatInterval]];
+              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];
+              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", 5];
            }
          else
            {
@@ -162,7 +139,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        {
          // Simple reccurrence rule of type "Monthly"
          type = 2;
-          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"%@:\">%d</Recurrence_DayOfMonth>", t, [[self _adjustedStartDate] dayOfMonth]];
+          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
+             [[[self parent] startDate] dayOfMonth]];
        }
    }
  else if ([self frequency] == iCalRecurrenceFrequenceYearly)
@@ -181,39 +159,33 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              if (firstOccurrence < 0)
                firstOccurrence = 5;
              
-              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"%@:\">%d</Recurrence_DayOfWeek>", t, (1 << [dm firstDay])];
-              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"%@:\">%d</Recurrence_WeekOfMonth>", t, firstOccurrence];
-              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"%@:\">%@</Recurrence_MonthOfYear>", t,
+              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];
+              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", firstOccurrence];
+              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%@</Recurrence_MonthOfYear>",
                 [self flattenedValuesForKey: @"bymonth"]];
            }
          else
            {
              type = 5; // Yearly
              
-              [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"%@:\">%@</Recurrence_DayOfMonth>", t,
+              [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%@</Recurrence_DayOfMonth>",
                 [self flattenedValuesForKey: @"bymonthday"]];
              
-              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"%@:\">%@</Recurrence_MonthOfYear>", t,
+              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%@</Recurrence_MonthOfYear>",
                 [self flattenedValuesForKey: @"bymonth"]];
            }
        }
      else
-        {
-          type = 5;
-          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"%@:\">%d</Recurrence_DayOfMonth>", t, [[self _adjustedStartDate] dayOfMonth]];
-          [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"%@:\">%d</Recurrence_MonthOfYear>", t, [[self _adjustedStartDate] monthOfYear]];
-        }
+        type = 5;
    }
  
-  [s appendFormat: @"<Recurrence_Type xmlns=\"%@:\">%d</Recurrence_Type>", t, type];
-
-  if ([[self parent] isKindOfClass: [iCalToDo class]])
-    [s appendFormat: @"<Recurrence_Start xmlns=\"%@:\">%@</Recurrence_Start>", t, [[[self parent] startDate] activeSyncRepresentationInContext: context]];
+  [s appendFormat: @"<Recurrence_Type xmlns=\"Calendar:\">%d</Recurrence_Type>", type];

  // Occurrences / Until
+  //[s appendFormat: @"<Recurrence_Occurrences xmlns=\"Calendar:\">%d</Recurrence_Occurrences>", 5];
  if ([self repeatCount])
    {
-      [s appendFormat: @"<Recurrence_Occurrences xmlns=\"%@:\">%@</Recurrence_Occurrences>", t,
+      [s appendFormat: @"<Recurrence_Occurrences xmlns=\"Calendar:\">%@</Recurrence_Occurrences>",
         [self flattenedValuesForKey: @"count"]];
    }
  else if ([self untilDate])
@@ -224,10 +196,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      //ud = [[context activeUser] userDefaults];
      //[date setTimeZone: [ud timeZone]];
      
-      [s appendFormat: @"<Recurrence_Until xmlns=\"%@:\">%@</Recurrence_Until>", t,
+      [s appendFormat: @"<Recurrence_Until xmlns=\"Calendar:\">%@</Recurrence_Until>",
         [date activeSyncRepresentationWithoutSeparatorsInContext: context]];
    }  

+
  [s appendString: @"</Recurrence>"];

  return s;
@@ -128,7 +128,7 @@ struct SYSTEMTIME {
  //uint16_t wStandardYear;
  struct SYSTEMTIME stStandardDate;
  //uint16_t wDaylightYear;
-  struct SYSTEMTIME stDaylightDate = {0,0,0,0,0,0,0,0};
+  struct SYSTEMTIME stDaylightDate;

  char standardName[64], daylightName[64];

@@ -144,17 +144,13 @@ struct SYSTEMTIME {

  period = [self _mostRecentPeriodWithName: @"DAYLIGHT"];  
  if (!period)
-    {
-      stStandardDate.wMonth = 0;
-      lDaylightBias = 0;
-    }
-  else
-    {
-      lDaylightBias = (uint32_t) -([period secondsOffsetFromGMT] / 60) - lBias;
-      [period _fillTZDate: &stDaylightDate];
-      //wStandardYear = stStandardDate.wYear;
-      //wDaylightYear = stDaylightDate.wYear;
-    }
+    stStandardDate.wMonth = 0;
+
+  lDaylightBias = (uint32_t) -([period secondsOffsetFromGMT] / 60) - lBias;
+  [period _fillTZDate: &stDaylightDate];
+  //wStandardYear = stStandardDate.wYear;
+  //wDaylightYear = stDaylightDate.wYear;
+

  // We build the timezone
  [bytes appendBytes: &lBias  length: 4];
@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <NGExtensions/NSString+misc.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WORequest.h>

 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
@@ -47,12 +46,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalTimeZone.h>

-#import <Appointments/iCalEntityObject+SOGo.h>
-
 #include "NSDate+ActiveSync.h"
 #include "NSString+ActiveSync.h"
-#include "iCalRecurrenceRule+ActiveSync.h"
-#include "iCalAlarm+ActiveSync.h"

@implementation iCalToDo (ActiveSync)

@@ -67,10 +62,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  s = [NSMutableString string];

  // Complete
-  [s appendFormat: @"<Complete xmlns=\"Tasks:\">%d</Complete>", [[self status] isEqualToString: @"COMPLETED"] ? 1 : 0];
+  o = [self completed];
+  [s appendFormat: @"<Complete xmlns=\"Tasks:\">%d</Complete>", (o ? 1 : 0)];
  
  // DateCompleted
-  if ((o = [self completed]))
+  if (o)
    [s appendFormat: @"<DateCompleted xmlns=\"Tasks:\">%@</DateCompleted>", [o activeSyncRepresentationInContext: context]];
  
  // Start date
@@ -87,10 +83,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [s appendFormat: @"<DueDate xmlns=\"Tasks:\">%@</DueDate>", [o activeSyncRepresentationInContext: context]];
      [s appendFormat: @"<UTCDueDate xmlns=\"Tasks:\">%@</UTCDueDate>", [o activeSyncRepresentationInContext: context]];
    }
-
-  // Recurrence rules
-  if ([self isRecurrent])
-    [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
  
  // Importance
  o = [self priority];
@@ -102,21 +94,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    v = 1;
  [s appendFormat: @"<Importance xmlns=\"Tasks:\">%d</Importance>", v];
                    
-  // Reminder
-  if ([self hasAlarms])
-    {
-      iCalAlarm *alarm;
-
-      alarm = [self firstDisplayOrAudioAlarm];
-      [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 1];
-      [s appendString: [alarm activeSyncRepresentationInContext: context]];
-    }
-  else
-    {
-      [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 0];
-    }
+  // Reminder - FIXME
+  [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 0];
  
-  // Sensitivity
  if ([[self accessClass] isEqualToString: @"PRIVATE"])
    v = 2;
  else if ([[self accessClass] isEqualToString: @"CONFIDENTIAL"])
@@ -124,8 +104,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  else
    v = 0;

-  [s appendFormat: @"<Sensitivity xmlns=\"Tasks:\">%d</Sensitivity>", v];
-
  categories = [self categories];

  if ([categories count])
@@ -148,22 +126,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      // 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 objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
-        {
-          [s appendFormat: @"<Body xmlns=\"Tasks:\">%@</Body>", o];
-          [s appendString: @"<BodyTruncated xmlns=\"Tasks:\">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>"];
-        }
+      [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>"];
    }
-
+  
  return s;
 }

@@ -183,16 +152,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    [self setSummary: o];

  // FIXME: merge with iCalEvent
-  if ([[context objectForKey: @"ASProtocolVersion"] isEqualToString: @"2.5"])
-    {
-      if ((o = [theValues objectForKey: @"Body"]))
-        [self setComment: o];
-    }
-  else
-    {
-      if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
-        [self setComment: o];
-    }
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
  
  if ([[theValues objectForKey: @"Complete"] intValue] &&
      ((o = [theValues objectForKey: @"DateCompleted"])) )
@@ -204,11 +166,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [completed setDate: o];
      [self setStatus: @"COMPLETED"];
    }
-  else
-   {
-     [self setStatus: @"IN-PROCESS"];
-     [self setCompleted: nil];
-   }

  if ((o = [theValues objectForKey: @"DueDate"]))
    {
@@ -220,16 +177,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      [due setDateTime: o];
    }

-  if ((o = [theValues objectForKey: @"StartDate"]))
-    {
-      iCalDateTime *due;
-
-      o = [o calendarDate];
-      due = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
-      [due setTimeZone: tz];
-      [due setDateTime: o];
-    }
-
  // 2 == high, 1 == normal, 0 == low
  if ((o = [theValues objectForKey: @"Importance"]))
    {
@@ -267,39 +214,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  if ((o = [theValues objectForKey: @"ReminderTime"]))
    {
-      iCalAlarm *alarm;
-
-      alarm = [[iCalAlarm alloc] init];
-      [alarm takeActiveSyncValues: theValues  inContext: context];
-
-      [self removeAllAlarms];
-      [self addToAlarms: alarm];
-      RELEASE(alarm);

    }
-
-  // Recurrence
-  if ((o = [theValues objectForKey: @"Recurrence"]) && !([[o objectForKey: @"Recurrence_DeadOccur"] intValue]))
-    {
-      iCalRecurrenceRule *rule;
-
-      rule = [[iCalRecurrenceRule alloc] init];
-      [self setRecurrenceRules: [NSArray arrayWithObject: rule]];
-      RELEASE(rule);
-
-      [rule takeActiveSyncValues: o  inContext: context];
-
-      if (!([theValues objectForKey: @"StartDate"]))
-        {
-          iCalDateTime *start;
-
-          start = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
-
-          [start setTimeZone: tz];
-          [start setDate: [[o objectForKey: @"Recurrence_Start"] calendarDate]];
-        }
-    }
-
 }

@end
@@ -57,6 +57,8 @@ 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.
@@ -65,15 +67,11 @@ ProxyPreserveHost On
 # 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" "%{HTTP_HOST}e" env=HTTP_HOST
-  RequestHeader set "x-webobjects-server-url" "https://%{HTTP_HOST}e" env=HTTP_HOST
+  RequestHeader set "x-webobjects-server-name" "yourhostname"
+  RequestHeader set "x-webobjects-server-url" "https://yourhostname"

 ## When using proxy-side autentication, you need to uncomment and
 ## adjust the following line:
@@ -81,7 +79,6 @@ 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

@@ -93,6 +90,5 @@ 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>

@@ -2,8 +2,7 @@ all: $(patsubst %.asciidoc,%.pdf,$(wildcard *.asciidoc))

 %.pdf : %.asciidoc
 	asciidoc -a docinfo1 -b docbook -d book -o $<.docbook $<
-	xsltproc -o $<.fo docbook/xsl/sogo-fo.xsl $<.docbook
-	fop -c fonts/fop-config.xml $<.fo -pdf $@
+	fop -c fonts/fop-config.xml -xsl docbook/xsl/sogo-fo.xsl -xml $<.docbook -pdf $@

 clean:
-	rm -f *.asciidoc.fo *.asciidoc.docbook *.pdf
+	rm *.asciidoc.docbook *.pdf
@@ -1,7 +1,5 @@
 Installation and Configuration Guide
 ====================================
-:toc: left
-:icons: font

 ////

@@ -18,13 +16,13 @@ About this Guide

 This guide will walk you through the installation and configuration of
 the SOGo solution. It also covers the installation and configuration of
-SOGo ActiveSync support - the solution used to synchronize mobile
+SOGo ActiveSync support – the solution used to synchronize mobile
 devices with SOGo.

 The instructions are based on version {release_version} of SOGo.

 The latest version of this guide is available
-at http://sogo.nu/downloads/documentation.html.
+at http://www.sogo.nu/downloads/documentation.html.

 Introduction
 ------------
@@ -47,15 +45,16 @@ and the data of Mozilla Thunderbird and Lightning
 the SOGo Connector and the SOGo Integrator
 * Native compatibility for Microsoft Outlook 2003, 2007, 2010, and 2013
 * Two-way synchronization support with any Microsoft ActiveSync-capable
-device, or Outlook 2013/2016
+device, or Outlook 2013

 SOGo is developed by a community of developers located mainly in North
-America and Europe. More information can be found at http://sogo.nu/
+America and Europe. More information can be found
+at http://www.sogo.nu/

 Architecture and Compatibility
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

 Standard protocols such as CalDAV, CardDAV, GroupDAV, HTTP, IMAP and
 SMTP are used to communicate with the SOGo platform or its
@@ -168,10 +167,10 @@ Operating System Requirements
 The following 32-bit and 64-bit operating systems are currently
 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 12.04 (Precise) to 14.04 (Trusty)
+* Red Hat Enterprise Linux (RHEL) Server 5 and 6
+* Community ENTerprise Operating System (CentOS) 5 and 6
+* Debian GNU/Linux 5.0 (Lenny) to 7.0 (Wheezy)
+* Ubuntu 10.04 (Lucid) 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.
@@ -180,7 +179,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.

-NOTE: This document covers the installation of SOGo under RHEL 6.
+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/.
@@ -195,17 +194,11 @@ Installation

 This section will guide you through the installation of SOGo together
 with its dependencies. The steps described here apply to an RPM-based
-installation for a Red Hat or CentOS 6 distribution. Most of these steps
-should apply to all supported operating systems.
+installation for a Red Hat or CentOS distribution.

 Software Downloads
 ~~~~~~~~~~~~~~~~~~

-[NOTE]
-In order to access the production builds, you need a proper support contract
-from https://sogo.nu/support/index_new.html#support-plans[Inverse]. Continue
-with the configuration once you received your username and password.
-
 SOGo can be installed using the `yum` utility. To do so, first create
 the `/etc/yum.repos.d/inverse.repo` configuration file with the following
 content:
@@ -213,22 +206,19 @@ content:
 ----
 [SOGo]
 name=Inverse SOGo Repository
-baseurl=https://<username>:<password>@packages.inverse.ca/SOGo/release/2/rhel/6/$basearch
+baseurl=http://inverse.ca/downloads/SOGo/RHEL6/$basearch
 gpgcheck=0
 ----

-[NOTE]
-Any non-URL safe characters in username/password must be URL-encoded.  For
-example, if your password is `so%go`, you must set the value in your
-configuration file to `so%25go` - where `%` is encoded to `%25`.
+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/.
+Also make sure you enabled the "rpmforge-extras" repository.

-Inverse signs its RPM packages with its GPG key. Integrity verification happens
-all by itself on package installation, all you need to do is first import the
-key into your rpm keychain:
-
----
-rpm --import "https://pgp.mit.edu/pks/lookup?op=get&search=0xCB2D3A2AA0030E2C"
----
+For more information on using RepoForge,
+visit http://repoforge.org/use/.

 Software Installation
 ~~~~~~~~~~~~~~~~~~~~~
@@ -303,7 +293,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, 400, 400]
+image::images/preferences-hierarchy.png[Preferences Hierarchy]

 Each level inherits the preferences of the parent level. Therefore,
 domain preferences define the defaults values of the user preferences,
@@ -377,13 +367,6 @@ 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
@@ -491,7 +474,7 @@ SOGoSAML2LogoutEnabled must be set to YES. If unset, the user will be
 redirected to a blank page.

 |D |SOGoTimeZone
-|Mandatory parameter used to set a default time zone for users. The default
+|Parameter used to set a default time zone for users. The default
 timezone is set to UTC. The Olson database is a standard database that
 takes all the time zones around the world into account and represents
 them along with their history. On GNU/Linux systems, time zone
@@ -513,8 +496,8 @@ In our example, we set the default domain to `acme.com`.
 meeting participants. Possible values are:

 [options="compact"]
-* `YES` - to send notifications
-* `NO` - to not send notifications
+* `YES` – to send notifications
+* `NO` – to not send notifications

 Defaults to `NO` when unset.

@@ -583,36 +566,17 @@ usernames like this: `SOGoSuperUsernames = (<username1>[, <username2>, ...]);`
 for SOGo. Possible values are:

 [options="compact"]
-* `Arabic`
-* `Basque`
 * `BrazilianPortuguese`
-* `Catalan`
-* `ChineseTaiwan`
-* `Croatian`
 * `Czech`
-* `Danish`
 * `Dutch`
 * `English`
-* `Finnish`
 * `French`
 * `German`
 * `Hungarian`
-* `Icelandic`
 * `Italian`
-* `Lithuanian`
-* `Macedonian`
-* `NorwegianBokmal`
-* `NorwegianNynorsk`
-* `Polish`
-* `Portuguese`
 * `Russian`
-* `Slovak`
-* `Slovenian`
-* `SpanishArgentina`
-* `SpanishSpain`
+* `Spanish`
 * `Swedish`
-* `TurkishTurkey`
-* `Ukrainian`
 * `Welsh`

 |D |SOGoNotifyOnPersonalModifications
@@ -620,8 +584,8 @@ for SOGo. Possible values are:
 someone changes his/her own calendar. Possible values are:

 [options="compact"]
- `YES` - to send notifications
- `NO` - to not send notifications
+- `YES` – to send notifications
+- `NO` – to not send notifications

 Defaults to `NO` when unset. User can overwrite this from the calendar
 properties window.
@@ -632,8 +596,8 @@ modification is being done to his/her own calendar by someone else.
 Possible values are:

 [options="compact"]
-* `YES` - to send notifications
-* `NO` - to not send notifications
+* `YES` – to send notifications
+* `NO` – to not send notifications

 Defaults to `NO` when unset. User can overwrite this from the calendar
 properties window.
@@ -656,8 +620,8 @@ requiring not authentication) their calendars and address books.
 Possible values are:

 [options="compact"]
-* `YES` - to allow them
-* `NO` - to prevent them from doing so
+* `YES` – to allow them
+* `NO` – to prevent them from doing so

 Defaults to `NO` when unset.

@@ -668,8 +632,8 @@ SOGo.
 Possible values are:

 [options="compact"]
-* `YES` - to allow them
-* `NO` - to prevent them from doing so
+* `YES` – to allow them
+* `NO` – to prevent them from doing so

 Defaults to `NO` when unset.

@@ -685,7 +649,7 @@ of 1 day by default.
 |Parameter used to configure which languages are available from SOGo's
 Web interface. Available languages are specified as an array of string.

-The default value is: `( "Arabic", "Basque", "Catalan", "Czech", "Dutch", "Danish", "Welsh", "English", "SpanishSpain", "SpanishArgentina", "Finnish", "French", "German", "Icelandic", "Italian", "Hungarian", "BrazilianPortuguese", "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian", "Slovak", "Ukrainian", "Swedish" )`
+The default value is: `( "Czech", "Welsh", "English", "Spanish", "French", "German", "Italian", "Hungarian", "Dutch", "BrazilianPortuguese", "Polish", "Russian", Ukrainian", "Swedish" )`

 |D |SOGoHideSystemEMail
 |Parameter used to control if SOGo should hide or not the system email
@@ -699,7 +663,7 @@ Defaults to `NO` when unset.
 string (attendee completion, address book search, etc.) prior triggering
 the server-side search operation.

-Defaults to `2` when unset - which means a search operation will be
+Defaults to `2` when unset – which means a search operation will be
 triggered on the 3rd typed character.

 |S |SOGoMaximumFailedLoginCount
@@ -737,21 +701,6 @@ 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
@@ -894,7 +843,7 @@ source:

 [cols="^3,>47,50a"]
 |=======================================================================
-.34+|D <|SOGoUserSources
+.33+|D <|SOGoUserSources
 |Parameter used to set the LDAP and/or SQL sources used for
 authentication and global address books. Multiple sources can be
 specified as an array of dictionaries. A dictionary that defines an LDAP
@@ -904,7 +853,7 @@ source can contain the following values:
 |The type of this user source, set to ldap` for an LDAP source.

 |id
-|The identification name of the LDAP repository. This must be unique -
+|The identification name of the LDAP repository. This must be unique –
 even when using multiple domains.

 |CNFieldName
@@ -923,8 +872,7 @@ table.

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

 |SearchFieldNames
 |An array of fields to to match against the search string when filtering
@@ -971,8 +919,8 @@ be marked as busy the first time it is booked.
 EOQualifier. The following operators are supported:

 [options="compact"]
-* `<>` - inequality operator
-* `=` - equality operator
+* `<>` – inequality operator
+* `=` – equality operator

 Multiple qualifiers can be joined by using `OR` and `AND`, they can also
 be grouped together by using parenthesis. Attribute values should be
@@ -1034,9 +982,9 @@ be specified as a LDAP Extension in the LDAP URL (e.g.
 without Password Policies enabled.

 Possible values are: `none`, `plain`, `crypt`, `md5`, `md5-crypt`,
-`sha256-crypt` and `sha512-crypt`, `smd5`, `cram-md5` and `sha`, `sha256`,
-`sha512` and its ssha (e.g. `ssha` or `ssha256`) variants
-(plus setting of the encoding with `.b64` or `.hex`).
+`smd5`, `cram-md5` and `sha`, `sha256`, `sha512` and its ssha (e.g.
+`ssha` or `ssha256`) variants (plus setting of the encoding with `.b64`
+or `.hex`).

 For a more detailed description see
 http://wiki.dovecot.org/Authentication/PasswordSchemes.
@@ -1045,9 +993,6 @@ Note that `cram-md5` is not actually using cram-md5 (due to the lack of
 challenge-response mechanism), its just saving the intermediate MD5
 context as Dovecot stores in its database.

-Also note that `sha256-crypt` and `sha512-crypt` requires that your
-operating system supports glibc 2.7 or more recent.
-
 |canAuthenticate
 |If set to `YES`, this LDAP source is used for authentication

@@ -1058,14 +1003,6 @@ this feature, every LDAP requests will fail. Note that some LDAP servers
 require LDAP/SSL for password policies to work. This is the case for
 example with 389 Directory Server.

-|updateSambaNTLMPasswords
-|If set to `YES`, SOGo will automatically update the sambaNTPassword
-and sambaLMPassword attributes when changing passwords. The attributes
-must be called sambaNTPassword and sambaLMPassword. You must also make
-sure the correct ACL is set in your LDAP server to allow users to change
-their own sambaNTPassword and sambaLMPassword password attributes.
-Defaults to `NO` when unset.
-
 |isAddressBook
 |If set to `YES`, this LDAP source is used as a shared address book
 (with read-only access). Note that if set to `NO`, autocompletion will
@@ -1077,8 +1014,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`,
-and/or `ActiveSync` for example:
+attribute; must be a dictionary with keys `Mail`, and/or `Calendar`, for
+example:

 ----
 ModulesConstraints = {
@@ -1103,11 +1040,6 @@ of supported attributes.
 user addressbooks (see _abOU_ below), this list of object classes will
 be applied to new records as they are created.

-|GroupObjectClasses
-|A list (array) of names identifying groups within the LDAP source. If not
-set, SOGo will use `group`, `groupofnames`, `groupofuniquenames`
-and `posixgroup`.
-
 |modifiers
 |A list (array) of usernames that are authorized to perform
 modifications to the address book defined by this LDAP source.
@@ -1167,7 +1099,7 @@ fax number, one could map it to the _facsimiletelephonenumber_ attribute
 like this:

 ----
-mapping = {
+mapping = \{
   facsimiletelephonenumber = ("fax", "facsimiletelephonenumber");
 };
 ----
@@ -1364,35 +1296,12 @@ 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:

 ----
-su - postgres
-createuser --no-superuser --no-createdb --no-createrole \
-	--encrypted --pwprompt sogo
+su – postgres
+createuser --no-superuser --no-createdb –-no-createrole \
+	–-encrypted --pwprompt sogo
 (specify “sogo” as password)
 createdb -O sogo sogo
 ----
@@ -1420,27 +1329,27 @@ The following table describes the parameters that were set:

 [cols="3,47,50a"]
 |=======================================================================
-|S |SOGoProfileURL
+|D |SOGoProfileURL
 |Parameter used to set the database URL so that SOGo can retrieve user
 profiles.

 For MySQL, set the database URL to something like:
 `mysql://sogo:sogo@localhost:3306/sogo/sogo_user_profile`.

-|S |OCSFolderInfoURL
+|D |OCSFolderInfoURL
 |Parameter used to set the database URL so that SOGo can retrieve the
 location of user folders (address books and calendars).

 For Oracle, set the database URL to something like:
 `oracle://sogo:sogo@localhost:1526/sogo/sogo_folder_info`.

-|S |OCSSessionsFolderURL
+|D |OCSSessionsFolderURL
 |Parameter used to set the database URL so that SOGo can store and
 retrieve secured user sessions information. For PostgreSQL, the database
 URL could be set to something like:
 `postgresql://sogo:sogo@localhost:5432/sogo/sogo_sessions_folder`.

-|S |OCSEMailAlarmsFolderURL
+|D |OCSEMailAlarmsFolderURL
 |Parameter used to set the database URL for email-based alarms (that can
 be set on events and tasks). This parameter is relevant only if
 _SOGoEnableEMailAlarms_ is set to `YES`. For PostgreSQL, the database
@@ -1450,13 +1359,6 @@ 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:

 ----
@@ -1493,7 +1395,7 @@ source can contain the following values:
 |The type of this user source, set to `sql` for a SQL source.

 |id
-|The identification name of the SQL repository. This must be unique -
+|The identification name of the SQL repository. This must be unique –
 even when using multiple domains.

 |viewURL
@@ -1501,9 +1403,9 @@ even when using multiple domains.
 present. Required columns are:

 [options="compact"]
-* `c_uid`: will be used for authentication - it's a username or
+* `c_uid`: will be used for authentication – it's a username or
  username@domain.tld
-* `c_name`: will be used to uniquely identify entries - which can be
+* `c_name`: will be used to uniquely identify entries – which can be
  identical to `c_uid`
 * `c_password`: password of the user, plain text, crypt, md5 or sha
  encoded 
@@ -1609,14 +1511,14 @@ SOGoUserSources =

 Certain database columns must be present in the view/table, such as:

-* `c_uid` - will be used for authentication - it's the username
+* `c_uid` – will be used for authentication – it's the username
 or username@domain.tld
-* `c_name` - which can be identical to `c_uid` - will be used to
+* `c_name` – which can be identical to `c_uid` – will be used to
  uniquely identify entries
-* `c_password` - password of the user, plain-text, md5 or sha encoded
+* `c_password` – password of the user, plain-text, md5 or sha encoded
  for now
-* `c_cn` - the user's common name - such as "John Doe"
-* `mail` - the user's mail address
+* `c_cn` – the user's common name – such as "John Doe"
+* `mail` – the user's mail address

 Note that groups are currently not supported for SQL-based
 authentication sources.
@@ -1636,22 +1538,16 @@ The following table describes the related parameters.
 are:

 [options="compact"]
-* `sendmail` - to use the sendmail binary
-* `smtp` - to use the SMTP protocol
+* `sendmail` – to use the sendmail binary
+* `smtp` – to use the SMTP protocol

 |D |SOGoSMTPServer
 |The DNS name or IP address of the SMTP server used when
 _SOGoMailingMechanism_ is set to `smtp`.
-Supported formats are: `smtp://domain:port`, `smtps://domain`,
-`domain:port`, `smtp://domain:port/?tls=YES`. Using the option
-`tls=YES` will enforce using STARTTLS smtp connections. Thus,
-`smtp://localhost:587/?tls=YES` would use the default MUA port
-on localhost with STARTTLS enforced.

 |D |SOGoSMTPAuthenticationType
 |Activate SMTP authentication and specifies which type is in use.
-Current, only `PLAIN` is supported and other values will cause
-the authentication to fail.
+Current, only `PLAIN` is supported and other values will be ignored.

 |S |WOSendMail
 |The path of the sendmail binary.
@@ -1706,16 +1602,6 @@ 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
@@ -1795,13 +1681,6 @@ cronjob `sogo-tmpwatch`.

 Defaults to `/var/spool/sogo`.

-|S |NGMimeBuildMimeTempDirectory
-|Parameter used to set the path where temporary files will be stored
-by SOPE when dealing with MIME messages.
-
-Defaults to `/tmp`.
-
-
 |S |NGImap4DisableIMAP4Pooling
 |Disables IMAP pooling when set to `YES`. Enable pooling by setting to
 `NO` or using a caching proxy like imapproxy.
@@ -1905,12 +1784,6 @@ host.

 Defaults to `NO` when unset.

-|D |SOGoForwardConstraints
-|Parameter used to set constraints on possible addresses used when
-automatically forwarding mails. When set to `0` (default), no constraint
-is enforced. When set to `1`, only internal domains can be used. When
-set to `2`, only external domains can be used.
-
 |D |SOGoSieveScriptsEnabled
 |Parameter used to activate the edition from the preferences windows of
 server-side mail filters. Requires Sieve script support on the IMAP
@@ -1918,11 +1791,6 @@ 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
@@ -2013,11 +1881,10 @@ events. This parameter is an array of arbitrary strings.

 Defaults to a list that depends on the language.

-|U |SOGoCalendarCategoriesColors
-|Parameter used to define the colour of categories. This parameter
-is a dictionary of category name/color.
+|U |SOGoCalendarDefaultCategoryColor
+|Parameter used to define the default colour of categories.

-Defaults to `#F0F0F0` for all categories when unset.
+Defaults to `#F0F0F0` when unset.

 |U |SOGoCalendarEventsDefaultClassification
 |Parameter used to defined the default classification for new events.
@@ -2175,21 +2042,7 @@ Defaults to `%{FolderName} (%{UserName} <%{Email}>)` when unset.
 the template named `UIxAdditionalPreferences.wox`. This template should
 be put under `~sogo/GNUstep/Library/SOGo/Templates/PreferencesUI/`.

-|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.
+Defaults to `NO` when unset.
 |=======================================================================

 SOGo Configuration Summary
@@ -2218,9 +2071,8 @@ like this:
    SOGoDraftsFolderName = Drafts;
    SOGoSentFolderName = Sent;
    SOGoTrashFolderName = Trash;
-    SOGoJunkFolderName = Junk;
    SOGoMailingMechanism = smtp;
-    SOGoSMTPServer = "smtp://127.0.0.1";
+    SOGoSMTPServer = 127.0.0.1;
    SOGoUserSources = (
        {
            type = ldap;
@@ -2245,8 +2097,7 @@ Multi-domains Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~

 If you want your installation to isolate two groups of users, you must
-define a distinct authentication source for each _domain_. Your domain keys
-must have the same value as your email domain you want to add. Following is
+define a distinct authentication source for each _domain_. Following is
 the same configuration that now includes two domains (acme.com and
 coyote.com):

@@ -2254,7 +2105,7 @@ coyote.com):
 {
 ...
    domains = {
-        acme.com = {
+        acme = {
            SOGoMailDomain = acme.com;
            SOGoDraftsFolderName = Drafts;
            SOGoUserSources = (
@@ -2275,7 +2126,7 @@ coyote.com):
                }
            );
        };
-        coyote.com = {
+        coyote = {
            SOGoMailDomain = coyote.com;
            SOGoIMAPServer = imap.coyote.com;
            SOGoUserSources = (
@@ -2306,7 +2157,7 @@ domains.
 [cols="3,47,50a"]
 |=======================================================================
 |S |SOGoEnableDomainBasedUID
-|Parameter used to enable user identification by domain. Users will be
+|Parameter used to activate user identification by domain. Users will be
 able (without being required) to login using the form `username@domain`,
 meaning that values of _UIDFieldName_ no longer have to be unique among
 all domains but only within the same domain. Internally, users will
@@ -2495,8 +2346,8 @@ easier. These GUI utilities can make use of templates to create and
 pre-configure typical user accounts or any standardized LDAP record,
 along with the correct object classes, fields and default values.

-Microsoft Enterprise ActiveSync
-------------------------------
+Microsoft ActiveSync
+--------------------

 SOGo supports the Microsoft ActiveSync protocol.

@@ -2562,29 +2413,17 @@ Defaults to `0`, which means no overwrite is performed.

 Setting this parameter to a value greater than `512` will
 have unexpected behaviour with various ActiveSync clients.
-|S |SOGoEASDebugEnabled
-|Parameter used to log the complete request and response of every single
-EAS command.
-
-Defaults to `NO`, which means no logging is performed.
-
-|S |SOGoMaximumPictureSize
-|Parameter used to overwrite the maximum number of bytes returned in the picture
-for EAS Search operations in the GAL.
-
-If not set, it defaults to `102400` bytes, or 100 KB.
 |=======================================================================

 Please be aware of the following limitations:

-* Outlook 2013/2016 does not search the GAL. One possible alternative
+* When creating an Outlook 2013 profile, you must actually kill Outlook
+before the end of the creation process. See http://www.vionblog.com/connect-zimbra-community-with-outlook-2013
+for a procedure example.
+* Outlook 2013 does not search the GAL. One possible alternative
 solution is to configure Outlook to use a LDAP server (over SSL) with
-authentication. Outlook 2013/2016 also does not seem to support multiple
+authentication. Outlook 2013 also does not seem to support multiple
 address books over ActiveSync.
-* To successfully synchronize Outlook email categories, a corresponding
-mail label (Preferences->Mail Options) has to be created manually in SOGo
-for each label defined in Outlook. The name in SOGo and in Outlook must be
-identical.
 * Make sure you do not use a self-signed certificate. While this will
 work, Outlook will work intermittently as it will raise popups for
 certificate validation, sometimes in background, preventing the user to
@@ -2595,9 +2434,9 @@ to handle many clients. Make sure you tune your SOGo server when having
 lots of ActiveSync clients.
 * Repetitive events with occurrences exceptions are currently not
 supported.
-* Outlook 2013/2016 Autodiscovery is currently not supported.
-* Outlook 2013/2016 freebusy lookups are supported using the Internet
-Free/Busy feature of Outlook 2013/2016. Please
+* Outlook 2013 Autodiscovery is currently not supported.
+* Outlook 2013 freebusy lookups are supported using the Internet
+Free/Busy feature of Outlook 2013. Please
 see http://support.microsoft.com/kb/291621 for configuration
 instructions. On the SOGo side, _SOGoEnablePublicAccess_ must be set to
 `YES` and the URL to use must be of the following format: 
@@ -2606,9 +2445,6 @@ instructions. On the SOGo side, _SOGoEnablePublicAccess_ must be set to
 need to adjust the word size of your IMAP server. In Dovecot, the parameter
 to increase is "imap_max_line_length" while under Cyrus IMAP Server, the
 parameter is "maxword". We suggest a buffer of 2MB.
-* If you are using MySQL, make sure you set "max_allowed_packet" to a large value
-since the EAS cache size can be large for mailboxes with thousands of messages.
-A 64M or even 128M value is recommended.

 In order to use the SOGo ActiveSync support code in production
 environments, you need to get a proper usage license from Microsoft.
@@ -2624,83 +2460,6 @@ and send an email to iplicreq@microsoft.com
 Inverse inc. provides this software for free, but is not responsible for
 anything related to its usage.

-Microsoft Enterprise ActiveSync Tuning
--------------------------------------
-
-First of all, it is important to know that most EAS devices will keep
-HTTP connections open to SOGo (and thus, Apache) for a long time. This
-is required for "push" to work properly. Connections can stay open for
-up to one hour, or 3600 seconds.
-
-The first parameter to check is related to Apache's proxying to
-SOGo:
-
----
-ProxyPass /Microsoft-Server-ActiveSync \
- http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync \
- retry=60 connectiontimeout=5 timeout=360
----
-
-The above line sets a timeout for up to 360 seconds, or 6 minutes. If
-you want to let EAS clients keep their HTTP connections open for up
-to an hour, you must change the timeout parameter and set it to 3600.
-
-If you change this value, the WOWatchDogRequestTimeout parameter must be changed
-accordingly in SOGo's configuration file (/etc/sogo/sogo.conf). By default,
-a SOGo child process is allowed to handle a request that can take up
-to 10 minutes before it gets killed by its parent process. When using
-EAS "push", the client expects to keep its connection open for up to one
-hour - so the WOWatchDogRequestTimeout, which is set in minutes,
-must be adjusted accordingly.
-
-EAS clients will keep HTTP connections open for a long time
-during these two EAS commands: Ping and Sync. By default, SOGo will prevent
-EAS clients from keeping connections for a long time. This is to avoid the
-situation where all SOGo child processes would be monopolized by EAS clients -
-rendering the SOGo web interface or DAV interface unavailable. The
-default SOGo behavior is thus similar to disable EAS push entirely.
-
-Two SOGo configuration parameters are available to modify this behavior:
-SOGoMaximumPingInterval (set by default to 10 seconds) and
-SOGoMaximumSyncInterval (set by default to 30 seconds). If you want
-connection to stay open for up to one hour, you should set these
-slightly under 3600 seconds (say 3540 - or 59 minutes). During a
-long-lived HTTP connection, the SOGo child process will perform
-internal polling to detect changes and return them to the EAS client
-if any changes are found. The parameter used to control this
-is SOGoInternalSyncInterval. By default, polling is done every 10
-seconds. This might generate too much load on large-scale system.
-
-The last configuration parameter to adjust is WOWorkersCount - which sets the
-number of SOGo child process that will be used to handle requests.
-You should have at least one child per EAS device configured to use
-"push". You must also have more children than you have EAS devices
-configured to use "push" - in order to handle normal SOGo requests to
-its Web or DAV interfaces.
-
-Here are some usage examples for EAS devices using "push". In all
-cases, the Apache timeout is set to 3600 and the
-WOWatchDogRequestTimeout parameter is set to 60.
-
-Example 1 - 100 users, 10 EAS devices:
-
----
-WOWorkersCount = 15;
-SOGoMaximumPingInterval = 3540;
-SOGoMaximumSyncInterval = 3540;
-SOGoInternalSyncInterval = 30;
----
-
-Example 2 - 1000 users, 100 EAS devices:
-
----
-WOWorkersCount = 120;
-SOGoMaximumPingInterval = 3540;
-SOGoMaximumSyncInterval = 3540;
-SOGoInternalSyncInterval = 60;
----
-
-
 Using SOGo
 ----------

@@ -2757,18 +2516,17 @@ To access your personal calendar:
 `http://localhost/SOGo/dav/jdoe/Calendar/personal/`
 * Click on Continue.

-Apple Calendar and iOS
-~~~~~~~~~~~~~~~~~~~~~~
+Apple iCal
+~~~~~~~~~~

-Apple Calendar and Mac OS X and the calendar application on iOS can also be used
-as a client application for SOGo.
+Apple iCal can also be used as a client application for SOGo.

-To configure the application so it works with SOGo, create a new account and specify,
+To configure it so it works with SOGo, create a new account and specify,
 as the Account URL, an URL such as:

 http://localhost/SOGo/dav/jdoe/

-Note that the trailing slash is important for the old Apple iCal 3 application.
+Note that the trailing slash is important for Apple iCal 3.

 Apple AddressBook
 ~~~~~~~~~~~~~~~~~
@@ -2831,21 +2589,6 @@ current version of SOGo from the previous release.

 [cols="100a"]
 |=======================================================================
-h|2.3.1
-|The SOGoCalendarDefaultCategoryColor default has been removed. If you
-want to customize the color of calendar categories, use the
-SOGoCalendarCategories and SOGoCalendarCategoriesColors defaults.
-
-h|2.3.0
-|Run the shell script `sql-update-2.2.17_to_2.3.0.sh` or
-`sql-update-2.2.17_to_2.3.0-mysql.sh` (if you use MySQL).
-
-This will grow the "participant states" field of calendar quick tables to a larger
-size and add the the "c_description" column to calendar quick tables.
-
-Moreover, if you are using a multi-domain configuration, make sure the keys for
-your domains match the email domains you have defined.
-
 h|2.2.8
 |The configuration configuration parameters were renamed:

@@ -233,14 +233,13 @@ 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 If you are using Red Hat Enterprise Linux version 6 x86_64, packages
 for Samba 4, OpenChange and SOGo and the SOGo OpenChange backend are
 available from SOGo's web site. Please follow the instructions from
-http://www.sogo.nu/english/downloads/backend.html.
+http://www.sogo.nu/english/downloads/backend_nightly.html.

 In order to satisfy certain dependencies, you should also add the EPEL
 source corresponding to your distribution and architecture. More
@@ -267,30 +266,32 @@ from this guide.

 [NOTE]
 Samba4/OpenChange are not available for now on CentOS 5 i386/x86_64,
-and CentOS 7. On Debian-based systems, packages are available only on
-the x86_64 platform.
+CentOS 6 i386 and CentOS 7.

-Debian 7 (Wheezy) and Ubuntu 12.04 (Precise Pangolin)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Debian 7.0 (Wheezy) and Ubuntu 12.04 (Precise Pangolin)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 SOGo, OpenChange and the SOGo OpenChange backend are now
 available from SOGo's web site. Please follow the instructions from
 http://www.sogo.nu/english/downloads/backend.html to setup your
 apt sources.

-On Debian7, for some Samba 4 dependencies, you need to use the
-_wheezy-backports_ repository. To do so, create
-`/etc/apt/sources.list.d/backports.list` with the following
-content:
+For Samba 4, you need to use the _wheezy-backports_ repository. To do so, create
+`/etc/apt/sources.list.d/backports.list`:

 deb http://http.debian.net/debian wheezy-backports main

+On Ubuntu 12.04, you will also have to add the Wheezy sources:
+
+ deb http://ftp.us.debian.org/debian wheezy main
+ deb http://security.debian.org/ wheezy/updates main
+
 Then install Samba 4 on top of an existing SOGo
 installation:

 ----
 apt-get update
-apt-get install samba samba-dev
+apt-get -t wheezy-backports install samba samba-dev
 ----

 Once completed, install the packages related to OpenChange and the SOGo
@@ -302,12 +303,7 @@ apt-get install openchangeserver \
                openchangeproxy \ 
                python-ocsmanager \
                mysql-server \
-                python-mysqldb \
-                openchange-ocsmanager \
-                openchange-rpcproxy \
-                python-sievelib \
-                python-spyne \
-                python-rpclib
+                python-mysqldb
 ----

 Once the packages are installed, refer to the _Configuration_ chapter
@@ -317,10 +313,12 @@ 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)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ubuntu 14.04 (Trusty Tahr)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For Ubuntu 14.04, you must not use the Debian Wheezy backports.

 Please follow the instructions from
 http://www.sogo.nu/english/downloads/backend.html to setup your
@@ -343,26 +341,12 @@ apt-get install openchangeserver \
                openchangeproxy \ 
                python-ocsmanager \
                mysql-server \
-                python-mysqldb \
-                openchange-ocsmanager \
-                openchange-rpcproxy \
-                python-sievelib \
-                python-spyne \
-                python-rpclib
+                python-mysqldb
 ----

 Once the packages are installed, refer to the _Configuration_ chapter
 from this guide.

-[NOTE]
-The `ocsmanager.conf` and `rpcproxy.conf` are currently located in
-`/etc/apache2/conf.d`. These should be moved to `/etc/apache2/conf-available`.
-This is a packaging error that will soon be fixed.
-
-[NOTE]
-You might have to adjust the `rpcproxy.conf` configuration file to add the
-`Require all granted` permission if you get Apache errors such as
-`client denied by server configuration`.

 Configuration
 -------------
@@ -388,7 +372,7 @@ Run the following commands as root:

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

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

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

 You might also have to
 remove `/etc/samba/smb.conf` prior running this command.
@@ -406,7 +390,6 @@ Add the following parameters to the `[global]` section of the

 ----
 ### Configuration required by OpenChange server ###
-dsdb:schema update allowed = true
 dcerpc endpoint servers = epmapper, mapiproxy, dnsserver
 dcerpc_mapiproxy:server = true
 dcerpc_mapiproxy:interfaces = exchange_emsmdb, exchange_nsp, exchange_ds_rfr
@@ -424,7 +407,6 @@ Your Samba 4 configuration file should look like this:
  netbios name = sogo
  passdb backend = samba4
  ### Configuration required by OpenChange server ###
-  dsdb:schema update allowed = true
  dcerpc endpoint servers = +epmapper, +mapiproxy
  dcerpc_mapiproxy:server = true
  dcerpc_mapiproxy:interfaces = exchange_emsmdb, exchange_nsp, exchange_ds_rfr
@@ -442,7 +424,7 @@ Your Samba 4 configuration file should look like this:
 OpenChange Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~

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

 First, create the OpenChange MySQL user:

@@ -513,11 +495,9 @@ 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:

@@ -548,14 +528,12 @@ 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`.
+in `/etc/apache2/conf.d/`.

 The configuration requires three Apache modules:  _mod_proxy_,
 _mod_proxy_http_ and _mod_wsgi_. These are usually already installed but
@@ -563,19 +541,13 @@ might need to be activated on Debian-based installations:

 a2enmod proxy proxy_http wsgi

-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`.
-////
+uncommented in `/etc/httpd/conf.d/wsgi.conf` (or
+`python26-mod_wsgi.conf` on RHELv5).

 The _reqtimeout_ apache module is known to cause problems when using the
 default configuration shipped with Debian-based systems. On such
-distributions, Apache will close (HTTP/1.1 500) any HTTP request for
+distributions, apache will close (HTTP/1.1 500) any HTTP request for
 which the HTTP body hasn't arrived in 10 seconds.

 While this is arguably good practice with regular HTTP, it will disrupt
@@ -587,112 +559,17 @@ 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

-Finally, you must adjust the OCS Manager configuration file, which is
-located in `/etc/ocsmanager/ocsmanager.ini`. You should enable LDAP-based
-authentication in the `main` section and configure it accordingly. You should
-also enable rpcproxy. You file should be similar to this one:
-
----
-[DEFAULT]
-debug = true
-email_to = you@yourdomain.com
-smtp_server = localhost
-error_email_from = paste@localhost
-
-[main]
-auth = ldap
-mapistore_root = /var/lib/samba/private
-mapistore_data = /var/lib/samba/private/mapistore
-debug = yes
-
-[auth:file]
-
-[auth:ldap]
-host = ldap://127.0.0.1
-port = 389
-bind_dn = cn=administrator,cn=Users,dc=example,dc=com
-bind_pw = %1OpenChange
-basedn = cn=Users,dc=example,dc=com
-
-[auth:single]
-username = openchange
-password = {SSHA}I6Hy5Wv0wuxyXvMBFWFQDVVN12_CLaX9
-
-[server:main]
-use = egg:Paste#http
-host = 127.0.0.1
-port = 5000
-protocol_version = HTTP/1.1
-
-[app:main]
-use = egg:ocsmanager
-full_stack = true
-static_files = true
-cache_dir = %(here)s/data
-beaker.session.key = ocsmanager
-beaker.session.secret = SDyKK3dKyDgW0mlpqttTMGU1f
-app_instance_uuid = {ee533ebc-f266-49d1-ae10-d017ee6aa98c}
-NTLMAUTHHANDLER_WORKDIR = /var/cache/ntlmauthhandler
-SAMBA_HOST = 127.0.0.1
-
-[rpcproxy:ldap]
-host = localhost
-port = 389
-basedn = CN=Users,DC=example,DC=com
-set debug = true
----
-
----
-[autodiscover]
-
-[autodiscover:rpcproxy]
-enabled = true
-
-[outofoffice]
-
-[outofoffice:file]
-sieve_script_path = /var/vmail/$domain/$user/sieve-script
-sieve_script_path_mkdir = false
-
-[outofoffice:managesieve]
-secret = secret
-
-[loggers]
-keys = root
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = console
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s] [%(threadName)s] %(message)s
----
-
-Once completed, start the OCS Manager service:
-
- /etc/init.d/openchange-ocsmanager start
+[NOTE]
+Debian-based distributions are not supported anymore for
+OCSManager/rpcproxy. Support will soon resume.

 Name Service Configuration for Web Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -818,10 +695,11 @@ 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 OpenChange. The script
-can be found in `/usr/share/openchange/`.
+the `openchange_user_cleanup` script distributed with SOGo. The script
+can be found in `/usr/share/doc/sogo/` (`/usr/share/sogo-VERSION/` on
+RHEL).
 To reset a user, run the script as root:
-`openchange_user_cleanup username`. See the usage output for additional options.
+`python 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
@@ -121,9 +121,9 @@
    </xsl:choose>
  </xsl:template>
  <xsl:template name="next.itemsymbol">
-    <xsl:param name="itemsymbol" select="'square'"/>
+    <xsl:param name="itemsymbol" select="'default'"/>
    <xsl:choose>
-      <xsl:when test="$itemsymbol='square'">square</xsl:when>
+      <xsl:otherwise>square</xsl:otherwise>
    </xsl:choose>
  </xsl:template>

@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 2.4.1 - June 2021</releaseinfo>
-<subtitle>for version 2.4.1</subtitle>
-<date>2021-06-01</date>
+<releaseinfo>Version 2.2.14 - January 2015</releaseinfo>
+<subtitle>for version 2.2.14</subtitle>
+<date>2015-01-20</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-2017 Inverse inc.
+    Copyright (C) 2008-2015 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.4.1
+:release_version: 2.2.14

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

 #import "SOGo+DAV.h"

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

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

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

@@ -581,6 +585,7 @@
                             @"addressbook", @"calendar-access",
                             @"calendar-schedule", @"calendar-auto-schedule",
                             @"calendar-proxy",
+
                             @"calendar-query-extended",
                             @"extended-mkcol",
                             @"calendarserver-principal-property-search",
@@ -35,7 +35,6 @@
 #import <GDLContentStore/GCSAlarmsFolder.h>
 #import <GDLContentStore/GCSSessionsFolder.h>

-#import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoClassSecurityInfo.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest+So.h>
@@ -124,7 +123,7 @@ static BOOL debugLeaks;
  vMemSizeLimit = [defaults vmemLimit];
  if (vMemSizeLimit > 0)
    [self logWithFormat: @"vmem size check enabled: shutting down app when "
-          @"vmem > %d MB. Currently at %d MB", vMemSizeLimit, [[NSProcessInfo processInfo] virtualMemorySize]/1048576];
+          @"vmem > %d MB", vMemSizeLimit];

  /* SoClass security declarations */
  sInfo = [self soClassSecurityInfo];
@@ -146,9 +145,7 @@ static BOOL debugLeaks;
  [$(@"SOGoFolder") soClass];

  /* load products */
-  [[SOGoProductLoader productLoader] loadAllProducts: YES];
-  if (vMemSizeLimit > 0)
-    [self logWithFormat: @"All products loaded - current memory usage at %d MB", [[NSProcessInfo processInfo] virtualMemorySize]/1048576];
+  [[SOGoProductLoader productLoader] loadAllProducts];
 }

 - (id) init
@@ -248,7 +245,7 @@ static BOOL debugLeaks;
 	}
      else
 	{
-	  [self errorWithFormat: @"No value specified for '%@'", *urlString];
+	  NSLog (@"No value specified for '%@'", *urlString);
 	  ok = NO;
 	}
    }
@@ -372,12 +369,8 @@ static BOOL debugLeaks;
             "GET" if no method was provided in the query path.
          */
          if ([_key length] > 0 && ![_key isEqualToString:@"favicon.ico"])
-            {
-              obj = [self lookupUser: _key inContext: _ctx];
-              if (!obj && ![_key isEqualToString: @"public"])
-		obj = [self lookupUser: @"anonymous" inContext: _ctx];
-            }
-       }
+            obj = [self lookupUser: _key inContext: _ctx];
+        }
    }
  else
    obj = nil;
@@ -403,12 +396,8 @@ static BOOL debugLeaks;
 - (WOResponse *) handleException: (NSException *) _exc
                       inContext: (WOContext *) _ctx
 {
-  WOResponse *resp;
-
-  NSLog(@"EXCEPTION: %s\n", [[_exc description] cString]);
-  resp = [WOResponse responseWithRequest: [_ctx request]];
-  [resp setStatus: 501];
-  return resp;
+  printf("EXCEPTION: %s\n", [[_exc description] cString]);
+  abort();
 }

 /* runtime maintenance */
@@ -436,12 +425,8 @@ static BOOL debugLeaks;
 {
  static NSArray *runLoopModes = nil;
  static BOOL debugOn = NO;
-
-  SOGoSystemDefaults *sd;
  WOResponse *resp;
  NSDate *startDate;
-  NSString *path;
-
  NSTimeInterval timeDelta;

  if (debugRequests)
@@ -451,13 +436,12 @@ static BOOL debugLeaks;
      startDate = [NSDate date];
    }

-  sd = [SOGoSystemDefaults sharedSystemDefaults];
  cache = [SOGoCache sharedCache];
 #ifdef GNUSTEP_BASE_LIBRARY
  if (debugLeaks)
    {
      if (debugOn)
-        [self logWithFormat: @"allocated classes:\n%s", GSDebugAllocationList (YES)];
+        NSLog (@"allocated classes:\n%s", GSDebugAllocationList (YES));
      else
        {
          debugOn = YES;
@@ -466,64 +450,6 @@ 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,15 +1,15 @@
 /*
  Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2006-2015 Inverse inc.
+  Copyright (C) 2006-2009 Inverse inc.

-  This file is part of SOGo.
+  This file is part of OpenGroupware.org.

-  SOGo is free software; you can redistribute it and/or modify it under
+  OGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
  Free Software Foundation; either version 2, or (at your option) any
  later version.

-  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  OGo 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 Lesser General Public
  License for more details.
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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 of the License, or
+    (at your option) any later version.
+
+    This program 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.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
@@ -0,0 +1,191 @@
+
+# GNUstep makefile
+
+include ../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
+
+BACKEND_VERSION = 1.0.0
+
+### bootstrap library
+MAPISTORESOGO = MAPIStoreSOGo
+LIBRARY_NAME = $(MAPISTORESOGO)
+
+$(MAPISTORESOGO)_VERSION = $(BACKEND_VERSION)
+
+$(MAPISTORESOGO)_OBJC_FILES += \
+	MAPIStoreSOGo.m
+
+### backend bundle
+SOGOBACKEND = SOGoBackend
+BUNDLE_NAME = $(SOGOBACKEND)
+BUNDLE_EXTENSION = .MAPIStore
+BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
+
+PYTHON = /usr/bin/python
+PYTHON_IS_GOOD = $(shell $(PYTHON) -c 'from sys import version_info; a=version_info; print a[0] == 2 and a[1] >= 6')
+ifeq (${PYTHON_IS_GOOD},False)
+PYTHON = /usr/bin/python2.6
+endif
+
+all::
+	@echo " Python executable: ${PYTHON}"
+
+SAMBA_PRIVATE_DIR = $(shell $(PYTHON) ./samba-get-config.py "private dir")
+
+$(SOGOBACKEND)_PRINCIPAL_CLASS = MAPIApplication
+
+$(SOGOBACKEND)_OBJC_FILES += \
+	MAPIApplication.m \
+	MAPIStoreActiveTables.m \
+	MAPIStoreAuthenticator.m \
+	MAPIStoreMapping.m \
+	MAPIStoreMIME.m \
+	MAPIStoreTypes.m \
+	MAPIStorePropertySelectors.m \
+	MAPIStoreSamDBUtils.m \
+	MAPIStoreUserContext.m \
+	\
+	SOGoMAPIDBMessage.m \
+	SOGoCacheGCSObject+MAPIStore.m \
+	\
+	MAPIStoreAppointmentWrapper.m \
+	MAPIStoreAttachment.m \
+	MAPIStoreAttachmentTable.m \
+	MAPIStoreContext.m \
+	MAPIStoreEmbeddedMessage.m \
+	MAPIStoreFolder.m \
+	MAPIStoreMessage.m \
+	MAPIStoreObject.m \
+	MAPIStoreObjectProxy.m \
+	MAPIStoreSOGoObject.m \
+	MAPIStoreTable.m \
+	MAPIStoreMessageTable.m \
+	MAPIStoreFolderTable.m \
+	MAPIStorePermissionsTable.m \
+	\
+	MAPIStoreDBBaseContext.m \
+	MAPIStoreDBFolder.m \
+	MAPIStoreDBFolderTable.m \
+	MAPIStoreDBMessage.m \
+	MAPIStoreDBMessageTable.m \
+	\
+	MAPIStoreFAIMessage.m \
+	MAPIStoreFAIMessageTable.m \
+	\
+	MAPIStoreGCSBaseContext.m \
+	MAPIStoreGCSFolder.m \
+	MAPIStoreGCSMessage.m \
+	MAPIStoreGCSMessageTable.m \
+	\
+	MAPIStoreCalendarAttachment.m \
+	MAPIStoreCalendarContext.m \
+	MAPIStoreCalendarFolder.m \
+	MAPIStoreCalendarMessage.m \
+	MAPIStoreCalendarEmbeddedMessage.m \
+	MAPIStoreCalendarMessageTable.m \
+	MAPIStoreRecurrenceUtils.m \
+	\
+	MAPIStoreContactsAttachment.m \
+	MAPIStoreContactsContext.m \
+	MAPIStoreContactsFolder.m \
+	MAPIStoreContactsMessage.m \
+	MAPIStoreContactsMessageTable.m \
+	\
+	MAPIStoreTasksContext.m \
+	MAPIStoreTasksFolder.m \
+	MAPIStoreTasksMessage.m \
+	MAPIStoreTasksMessageTable.m \
+	\
+	MAPIStoreMailAttachment.m \
+	MAPIStoreMailContext.m \
+	MAPIStoreMailFolder.m \
+	MAPIStoreMailMessage.m \
+	MAPIStoreMailVolatileMessage.m \
+	MAPIStoreMailMessageTable.m \
+	\
+	MAPIStoreNotesContext.m \
+	MAPIStoreNotesFolder.m \
+	MAPIStoreNotesMessage.m \
+	\
+	MAPIStoreFallbackContext.m \
+	\
+	NSArray+MAPIStore.m \
+	NSData+MAPIStore.m \
+	NSDate+MAPIStore.m \
+	NSObject+MAPIStore.m \
+	NSString+MAPIStore.m \
+	NSValue+MAPIStore.m \
+	\
+	iCalEvent+MAPIStore.m \
+	iCalTimeZone+MAPIStore.m \
+	\
+	RTFHandler.m
+
+
+$(SOGOBACKEND)_RESOURCE_FILES += \
+	product.plist
+
+### pl reader
+PLREADER_TOOL = plreader
+$(PLREADER_TOOL)_OBJC_FILES += \
+	plreader.m \
+
+DBMSGREADER_TOOL = dbmsgreader
+$(DBMSGREADER_TOOL)_OBJC_FILES += \
+	dbmsgreader.m \
+	NSObject+PropertyList.m
+
+$(DBMSGREADER_TOOL)_LIB_DIRS += \
+	-L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \
+	-L../SOPE/GDLContentStore/obj/ -lGDLContentStore \
+	-L../SOPE/NGCards/obj/ -lNGCards \
+	-lNGObjWeb
+
+TEST_TOOL_NAME += $(PLREADER_TOOL) $(DBMSGREADER_TOOL)
+
+### cflags and libs
+LIBMAPI_CFLAGS = $(shell pkg-config libmapi --cflags)
+
+ifeq ($(LIBMAPI_CFLAGS),)
+all install::
+	@echo "Cannot build the OpenChange SOGo backend (empty CFLAGS for libmapistore)"
+else
+
+SAMBA_LIB_DIR = $(shell pkg-config libmapistore --variable=libdir)
+
+LIBMAPI_LIBS = $(shell pkg-config libmapi --libs)
+
+LIBMAPISTORE_CFLAGS = $(shell pkg-config libmapistore --cflags) -DSAMBA_PREFIX="\"$(shell pkg-config libmapistore --variable=prefix)\""
+LIBMAPISTORE_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy -lWEExtensions
+
+$(MAPISTORESOGO)_INSTALL_DIR = $(DESTDIR)/$(SAMBA_LIB_DIR)/mapistore_backends
+$(MAPISTORESOGO)_LIB_DIRS += \
+        -L../SoObjects/SOGo/SOGo.framework/sogo/ -lSOGo -lgnustep-base -lobjc -lNGObjWeb \
+	$(LIBMAPI_LIBS) \
+	$(LIBMAPISTORE_LIBS)
+
+$(SOGOBACKEND)_LIB_DIRS += \
+        -L../SoObjects/SOGo/SOGo.framework/sogo/ -lSOGo \
+	$(LIBMAPI_LIBS) \
+	$(LIBMAPISTORE_LIBS)
+
+ADDITIONAL_INCLUDE_DIRS += \
+	-Werror -Wall \
+	-DSAMBA_PRIVATE_DIR=@"\"$(SAMBA_PRIVATE_DIR)\"" \
+	$(LIBMAPI_CFLAGS) \
+	$(LIBMAPISTORE_CFLAGS) \
+	-I../SoObjects -I../SOPE \
+	-DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" \
+	-DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\""
+
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+
+-include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/bundle.make
+include $(GNUSTEP_MAKEFILES)/library.make
+include $(GNUSTEP_MAKEFILES)/test-tool.make
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+-include GNUmakefile.postamble
+
+endif
@@ -0,0 +1,8 @@
+all:: MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h
+
+MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h: gen-property-selectors.py code-MAPIStorePropertySelectors.m code-MAPIStorePropertySelectors.h
+	@echo " Auto-generating MAPIStorePropertySelectors.[hm]..."
+	@$(PYTHON) ./gen-property-selectors.py -o MAPIStorePropertySelectors $(LIBMAPISTORE_CFLAGS)
+
+distclean clean::
+	-rm -f MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h
@@ -0,0 +1,43 @@
+/* MAPIApplication.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPIAPPLICATION_H
+#define MAPIAPPLICATION_H
+
+#import <NGObjWeb/SoApplication.h>
+
+@class MAPIStoreUserContext;
+
+@interface MAPIApplication : SoApplication
+{
+  MAPIStoreUserContext *userContext;
+}
+
+- (id) authenticatorInContext: (id) context;
+
+- (void) setUserContext: (MAPIStoreUserContext *) newContext;
+
+@end
+
+extern MAPIApplication *MAPIApp;
+
+#endif /* MAPIAPPLICATION_H */
@@ -0,0 +1,91 @@
+/* MAPIApplication.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSUserDefaults.h>
+#import <Foundation/NSTimeZone.h>
+#import <WEExtensions/WEResourceManager.h>
+
+#import <SOGo/SOGoProductLoader.h>
+#import <SOGo/SOGoSystemDefaults.h>
+
+#import <Appointments/iCalEntityObject+SOGo.h>
+
+#import "MAPIStoreUserContext.h"
+#import "MAPIStoreTypes.h"
+
+#import "MAPIApplication.h"
+
+MAPIApplication *MAPIApp = nil;
+
+@implementation MAPIApplication
+
+ (BOOL) isCachingEnabled;
+{
+  return NO;
+}
+
+- (NSString *) name
+{
+  return @"SOGo";
+}
+
+- (id) init
+{
+  if (!MAPIApp)
+    {
+      WEResourceManager *rm;
+
+      // TODO publish
+      [iCalEntityObject initializeSOGoExtensions];
+
+      MAPIApp = [super init];
+      [MAPIApp retain];
+
+      rm = [[WEResourceManager alloc] init];
+      [self setResourceManager:rm];
+      [rm release];
+
+      utcTZ = [NSTimeZone timeZoneWithName: @"UTC"];
+      [utcTZ retain];
+    }
+
+  return MAPIApp;
+}
+
+- (BOOL) shouldSetupSignalHandlers
+{
+  return NO;
+}
+
+- (void) setUserContext: (MAPIStoreUserContext *) newContext
+{
+  /* user contexts must not be retained here ad their holder (mapistore)
+     contexts must be active when any operation occurs. */
+  userContext = newContext;
+}
+
+- (id) authenticatorInContext: (id) context
+{
+  return [userContext authenticator];
+}
+
+@end
@@ -0,0 +1,47 @@
+/* MAPIStoreActiveTables.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTOREACTIVETABLES_H
+#define MAPISTOREACTIVETABLES_H
+
+#import <Foundation/NSObject.h>
+
+@class NSMutableArray;
+
+@class MAPIStoreTable;
+
+@interface MAPIStoreActiveTables : NSObject
+{
+  NSMutableArray *records;
+}
+
+ (id) activeTables;
+
+- (void) registerTable: (MAPIStoreTable *) table;
+- (void) unregisterTable: (MAPIStoreTable *) table;
+
+- (NSArray *) activeTablesForFMID: (uint64_t) fmid
+                          andType: (uint8_t) tableType;
+
+@end
+
+#endif /* MAPISTOREACTIVETABLES_H */
@@ -0,0 +1,198 @@
+/* MAPIStoreActiveTables.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+/* MAPIStoreActiveTables provides an interface to keep accounting of all
+   instances of a given table, independently from its store and context.
+   Primary useful for notifications across different connections. */
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreTable.h"
+
+#import "MAPIStoreActiveTables.h"
+
+@interface MAPIStoreActiveTableRecord : NSObject
+{
+  uint64_t folderId;
+  uint8_t tableType;
+  MAPIStoreTable *table;
+}
+
+ (id) recordForTable: (MAPIStoreTable *) newTable;
+- (id) initWithTable: (MAPIStoreTable *) newTable;
+
+- (MAPIStoreTable *) table;
+
+- (BOOL) exactlyMatchesTable: (MAPIStoreTable *) otherTable;
+- (BOOL) matchesFMID: (uint64_t) otherFMid
+        andTableType: (uint8_t) otherTableType;
+- (BOOL) matchesTable: (MAPIStoreTable *) otherTable;
+
+@end
+
+@implementation MAPIStoreActiveTableRecord : NSObject
+
+ (id) recordForTable: (MAPIStoreTable *) newTable
+{
+  MAPIStoreActiveTableRecord *record;
+
+  record = [[self alloc] initWithTable: newTable];
+  [record autorelease];
+
+  return record;
+}
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      folderId = 0;
+      tableType = 0;
+      table = nil;
+    }
+
+  return self;
+}
+
+- (id) initWithTable: (MAPIStoreTable *) newTable
+{
+  if ((self = [self init]))
+    {
+      table = newTable;
+      folderId = [[table container] objectId];
+      tableType = [table tableType];
+    }
+
+  return self;
+}
+
+- (MAPIStoreTable *) table
+{
+  return table;
+}
+
+- (BOOL) exactlyMatchesTable: (MAPIStoreTable *) otherTable
+{
+  return (table == otherTable);
+}
+
+- (BOOL) matchesFMID: (uint64_t) otherFMid
+        andTableType: (uint8_t) otherTableType
+{
+  return (tableType == otherTableType
+          && folderId == otherFMid);
+}
+
+- (BOOL) matchesTable: (MAPIStoreTable *) otherTable
+{
+  uint64_t otherFMid;
+  BOOL rc;
+
+  rc = [self exactlyMatchesTable: otherTable];
+  if (!rc)
+    {
+      otherFMid = [[otherTable container] objectId];
+      rc = [self matchesFMID: otherFMid andTableType: [otherTable tableType]];
+    }
+
+  return rc;
+}
+
+@end
+
+@implementation MAPIStoreActiveTables
+
+ (id) activeTables
+{
+  static MAPIStoreActiveTables *activeTables = nil;
+
+  if (!activeTables)
+    activeTables = [self new];
+
+  return activeTables;
+}
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      records = [NSMutableArray new];
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  [records release];
+  [super dealloc];
+}
+
+- (void) registerTable: (MAPIStoreTable *) table
+{
+  MAPIStoreActiveTableRecord *newRecord;
+
+  newRecord = [MAPIStoreActiveTableRecord recordForTable: table];
+  [records addObject: newRecord];
+}
+
+- (void) unregisterTable: (MAPIStoreTable *) table
+{
+  MAPIStoreActiveTableRecord *currentRecord;
+  NSUInteger count, max;
+  BOOL done = NO;
+
+  max = [records count];
+  for (count = 0; !done && count < max; count++)
+    {
+      currentRecord = [records objectAtIndex: count];
+      if ([currentRecord exactlyMatchesTable: table])
+        {
+          [records removeObject: currentRecord];
+          done = YES;
+        }
+    }
+}
+
+- (NSArray *) activeTablesForFMID: (uint64_t) fmid
+                          andType: (uint8_t) tableType
+{
+  NSUInteger count, max;
+  NSMutableArray *tables;
+  MAPIStoreActiveTableRecord *currentRecord;
+
+  tables = [NSMutableArray arrayWithCapacity: 5];
+
+  max = [records count];
+  for (count = 0; count < max; count++)
+    {
+      currentRecord = [records objectAtIndex: count];
+      if ([currentRecord matchesFMID: fmid andTableType: tableType])
+        [tables addObject: [currentRecord table]];
+    }
+
+  return tables;
+}
+
+@end
@@ -0,0 +1,174 @@
+/* MAPIStoreAppointmentWrapper.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTORECALENDARWRAPPER_H
+#define MAPISTORECALENDARWRAPPER_H
+
+#import <NGCards/iCalPerson.h>
+#import <Appointments/iCalEntityObject+SOGo.h>
+
+#import "MAPIStoreObjectProxy.h"
+
+@class NSTimeZone;
+
+@class iCalAlarm;
+@class iCalCalendar;
+@class iCalEvent;
+
+@class SOGoUser;
+
+@interface MAPIStoreAppointmentWrapper : MAPIStoreObjectProxy
+{
+  struct mapistore_connection_info *connInfo;
+  iCalCalendar *calendar;
+  iCalEvent *firstEvent;
+  iCalEvent *event;
+  NSTimeZone *timeZone;
+  SOGoUser *user;
+  NSString *senderEmail;
+  NSData *globalObjectId;
+  NSData *cleanGlobalObjectId;
+  BOOL alarmSet;
+  iCalAlarm *alarm;
+  BOOL itipSetup;
+  NSString *method;
+  iCalPersonPartStat partstat;
+}
+
+ (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;
+
+- (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;
+
+- (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
+                              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;
+
+/* 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;
+
+@end
+
+#endif /* MAPISTORECALENDARWRAPPER_H */
@@ -0,0 +1,59 @@
+/* MAPIStoreAttachment.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREATTACHMENT_H
+#define MAPISTOREATTACHMENT_H
+
+#import "MAPIStoreObject.h"
+
+@class NSData;
+@class MAPIStoreEmbeddedMessage;
+
+@interface MAPIStoreAttachment : MAPIStoreObject
+{
+  uint32_t aid;
+}
+
+- (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;
+
+/* helpers */
+- (NSData *) mimeAttachTag;
+
+/* move & copy operations */
+- (void) copyToAttachment: (MAPIStoreAttachment *) newAttachment  inMemCtx: (TALLOC_CTX *) memCtx;
+
+/* subclasses */
+- (MAPIStoreEmbeddedMessage *) openEmbeddedMessage;
+- (MAPIStoreEmbeddedMessage *) createEmbeddedMessage;
+
+@end
+
+#endif /* MAPISTOREATTACHMENT_H */
@@ -0,0 +1,194 @@
+/* MAPIStoreAttachment.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSData.h>
+
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreEmbeddedMessage.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreMessage.h"
+#import "MAPIStoreTypes.h"
+#import "NSObject+MAPIStore.h"
+
+#undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+
+@implementation MAPIStoreAttachment
+
+- (void) setAID: (uint32_t) newAID
+{
+  aid = newAID;
+}
+
+- (uint32_t) AID
+{
+  return aid;
+}
+
+- (NSString *) nameInContainer
+{
+  return [NSString stringWithFormat: @"%d", aid];
+}
+
+- (NSData *) mimeAttachTag
+{
+  static NSData *mimeAttachTag = nil;
+  char tagBytes[] = {0x2a, 0x86, 0x48, 0x86, 0xf7, 0x14, 0x03, 0x0a, 0x04};
+
+  if (!mimeAttachTag)
+    {
+      mimeAttachTag = [NSData dataWithBytes: tagBytes length: 9];
+      [mimeAttachTag retain];
+    }
+
+  return mimeAttachTag;
+}
+
+- (int) getPidTagMid: (void **) data
+            inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = MAPILongLongValue (memCtx, [container objectId]);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachNumber: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = MAPILongValue (memCtx, aid);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagRenderingPosition: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = MAPILongValue (memCtx, 0xffffffff);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) 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
+{
+  MAPIStoreEmbeddedMessage *attMessage;
+  struct mapistore_message *mapistoreMsg;
+  
+  mapistoreMsg = talloc_zero (memCtx, struct mapistore_message);
+
+  attMessage = [self openEmbeddedMessage];
+  if (attMessage)
+    {
+      *mid = [attMessage objectId];
+      *messagePtr = attMessage;
+      *mapistoreMsgPtr = mapistoreMsg;
+    }
+
+  return (attMessage ? MAPISTORE_SUCCESS : MAPISTORE_ERROR);
+}
+
+- (int) createEmbeddedMessage: (MAPIStoreEmbeddedMessage **) messagePtr
+             withMAPIStoreMsg: (struct mapistore_message **) mapistoreMsgPtr
+                     inMemCtx: (TALLOC_CTX *) memCtx
+{
+  MAPIStoreEmbeddedMessage *attMessage;
+  struct mapistore_message *mapistoreMsg;
+  
+  mapistoreMsg = talloc_zero (memCtx, struct mapistore_message);
+  attMessage = [self createEmbeddedMessage];
+  if (attMessage)
+    {
+      *messagePtr = attMessage;
+      *mapistoreMsgPtr = mapistoreMsg;
+    }
+
+  return (attMessage ? MAPISTORE_SUCCESS : MAPISTORE_ERROR);
+}
+
+- (NSDate *) creationTime
+{
+  return [container creationTime];
+}
+
+- (NSDate *) lastModificationTime
+{
+  return [container lastModificationTime];
+}
+
+- (uint64_t) objectVersion
+{
+  /* attachments have no version number */
+  return ULLONG_MAX;
+}
+
+- (void) copyToAttachment: (MAPIStoreAttachment *) newAttachment  inMemCtx: (TALLOC_CTX *) memCtx
+{
+  void *attachMethod;
+  enum mapistore_error error;
+  MAPIStoreEmbeddedMessage *embeddedMessage, *newEmbeddedMessage;
+
+  [self copyPropertiesToObject: newAttachment  inMemCtx: memCtx];
+
+  attachMethod = NULL;
+  error = [self getProperty: &attachMethod
+                    withTag: PidTagAttachMethod
+                   inMemCtx: NULL];
+  if (error == MAPISTORE_SUCCESS && attachMethod)
+    {
+      if (*(uint32_t *) attachMethod == afEmbeddedMessage)
+        {
+          embeddedMessage = [self openEmbeddedMessage];
+          newEmbeddedMessage = [newAttachment createEmbeddedMessage];
+          [embeddedMessage copyToMessage: newEmbeddedMessage  inMemCtx: memCtx];
+        }
+      talloc_free (attachMethod);
+    }
+}
+
+/* subclasses */
+- (MAPIStoreEmbeddedMessage *) openEmbeddedMessage
+{
+  // [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
+- (MAPIStoreEmbeddedMessage *) createEmbeddedMessage
+{
+  [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
+@end
@@ -0,0 +1,31 @@
+/* MAPIStoreAttachmentTable.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREATTACHMENTTABLE_H
+#define MAPISTOREATTACHMENTTABLE_H
+
+#import "MAPIStoreTable.h"
+
+@interface MAPIStoreAttachmentTable : MAPIStoreTable
+@end
+
+#endif /* MAPISTOREATTACHMENTTABLE_H */
@@ -0,0 +1,73 @@
+/* MAPIStoreAttachmentTable.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 "MAPIStoreMessage.h"
+
+#import "MAPIStoreAttachmentTable.h"
+
+@implementation MAPIStoreAttachmentTable
+
+- (NSArray *) childKeys
+{
+  if (!childKeys)
+    {
+      childKeys = [(MAPIStoreMessage *)
+                    container attachmentKeysMatchingQualifier: nil
+                                             andSortOrderings: sortOrderings];
+      [childKeys retain];
+    }
+
+  return childKeys;
+}
+
+- (NSArray *) restrictedChildKeys
+{
+  NSArray *keys;
+
+  if (!restrictedChildKeys)
+    {
+      if (restrictionState != MAPIRestrictionStateAlwaysTrue)
+        {
+          if (restrictionState == MAPIRestrictionStateNeedsEval)
+            keys = [(MAPIStoreMessage *)
+                     container attachmentKeysMatchingQualifier: restriction
+                                              andSortOrderings: sortOrderings];
+          else
+            keys = [NSArray array];
+        }
+      else
+        keys = [self childKeys];
+
+      ASSIGN (restrictedChildKeys, keys);
+    }
+
+  return restrictedChildKeys;
+}
+
+- (id) lookupChild: (NSString *) childKey
+{
+  return [(MAPIStoreMessage *) container lookupAttachment: childKey];
+}
+
+@end
@@ -0,0 +1,51 @@
+
+/* MAPIStoreAuthenticator.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTOREAUTHENTICATOR_H
+#define MAPISTOREAUTHENTICATOR_H
+
+#import <Foundation/NSObject.h>
+
+@class NSString;
+@class NSURL;
+
+@class WOContext;
+
+@interface MAPIStoreAuthenticator : NSObject
+{
+  NSString *username;
+  NSString *password;
+}
+
+- (void) setUsername: (NSString *) newUsername;
+- (NSString *) username;
+
+- (void) setPassword: (NSString *) newPassword;
+
+- (NSString *) imapPasswordInContext: (WOContext *) context
+                              forURL: (NSURL *) server
+                          forceRenew: (BOOL) renew;
+
+@end
+
+#endif /* MAPISTOREAUTHENTICATOR_H */
@@ -0,0 +1,75 @@
+/* MAPIStoreAuthenticator.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSURL.h>
+
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoPermissions.h>
+
+#import "MAPIStoreAuthenticator.h"
+
+@implementation MAPIStoreAuthenticator
+
+- (void) dealloc
+{
+        [username release];
+        [password release];
+        [super dealloc];
+}
+
+- (void) setUsername: (NSString *) newUsername
+{
+        ASSIGN (username, newUsername);
+}
+
+- (NSString *) username
+{
+  return username;
+}
+
+- (void) setPassword: (NSString *) newPassword
+{
+        ASSIGN (password, newPassword);
+}
+
+- (SOGoUser *) userInContext: (WOContext *)_ctx
+{
+        return [SOGoUser userWithLogin: username
+                                 roles: [NSArray arrayWithObject: SoRole_Authenticated]];
+}
+
+- (NSString *) imapPasswordInContext: (WOContext *) context
+                              forURL: (NSURL *) server
+                          forceRenew: (BOOL) renew
+{
+        NSString *imapPassword;
+
+        if (renew)
+                imapPassword = nil;
+        else
+                imapPassword = password;
+
+        return imapPassword;
+}
+
+@end
@@ -0,0 +1,43 @@
+/* MAPIStoreCalendarAttachment.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTORECALENDARATTACHMENT_H
+#define MAPISTORECALENDARATTACHMENT_H
+
+#import "MAPIStoreAttachment.h"
+
+@class NSTimeZone;
+
+@class iCalEvent;
+
+@interface MAPIStoreCalendarAttachment : MAPIStoreAttachment
+{
+  iCalEvent *event;
+  NSTimeZone *timeZone;
+}
+
+- (void) setEvent: (iCalEvent *) newEvent;
+- (iCalEvent *) event;
+
+@end
+
+#endif /* MAPISTORECALENDARATTACHMENT_H */
@@ -0,0 +1,255 @@
+/* MAPIStoreCalendarAttachment.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "iCalEvent+MAPIStore.h"
+#import "MAPIStoreCalendarEmbeddedMessage.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
+#import "NSDate+MAPIStore.h"
+#import "NSData+MAPIStore.h"
+#import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"
+
+#import "MAPIStoreCalendarAttachment.h"
+
+#undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+
+@implementation MAPIStoreCalendarAttachment
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      event = nil;
+      timeZone = nil;
+    }
+
+  return self;
+}
+
+- (id) initInContainer: (MAPIStoreObject *) newContainer
+{
+  MAPIStoreUserContext *userContext;
+
+  if ((self = [super initInContainer: newContainer]))
+    {
+      userContext = [newContainer userContext];
+      ASSIGN (timeZone, [userContext timeZone]);
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  [event release];
+  [timeZone release];
+  [super dealloc];
+}
+
+- (void) setEvent: (iCalEvent *) newEvent
+{
+  ASSIGN (event, newEvent);
+}
+
+- (iCalEvent *) event
+{
+  return event;
+}
+
+- (NSString *) nameInContainer
+{
+  return [[event uniqueChildWithTag: @"recurrence-id"]
+           flattenedValuesForKey: @""];
+}
+
+- (int) getPidTagAttachmentHidden: (void **) data
+                         inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  return [self getYes: data inMemCtx: localMemCtx];
+}
+
+- (int) getPidTagAttachmentFlags: (void **) data
+                        inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  *data = MAPILongValue (localMemCtx, 0x00000002); /* afException */
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachmentLinkId: (void **) data
+                         inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  return [self getLongZero: data inMemCtx: localMemCtx];
+}
+
+- (int) getPidTagAttachFlags: (void **) data
+                    inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  return [self getLongZero: data inMemCtx: localMemCtx];
+}
+
+- (int) getPidTagAttachMethod: (void **) data
+                     inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  *data = MAPILongValue (localMemCtx, afEmbeddedMessage);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachEncoding: (void **) data
+                      inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  *data = [[NSData data] asBinaryInMemCtx: localMemCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagDisplayName: (void **) data
+                    inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  *data = [@"Untitled" asUnicodeInMemCtx: localMemCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachmentContactPhoto: (void **) data
+                               inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getNo: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagExceptionReplaceTime: (void **) data
+                             inMemCtx: (TALLOC_CTX *) memCtx
+{
+  enum mapistore_error rc;
+  NSCalendarDate *dateValue;
+  NSInteger offset;
+
+  dateValue = [event recurrenceId];
+  if (dateValue)
+    {
+      rc = MAPISTORE_SUCCESS;
+      
+      if ([event isAllDay])
+        {
+          offset = -[timeZone secondsFromGMTForDate: dateValue];
+          dateValue = [dateValue dateByAddingYears: 0 months: 0 days: 0
+                                             hours: 0 minutes: 0
+                                           seconds: offset];
+        }
+      [dateValue setTimeZone: utcTZ];
+      *data = [dateValue asFileTimeInMemCtx: memCtx];
+    }
+  else
+    rc = MAPISTORE_ERR_NOT_FOUND;
+
+  return rc;
+}
+
+- (int) getPidTagExceptionStartTime: (void **) data
+                           inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  enum mapistore_error rc;
+  NSCalendarDate *dateValue;
+  NSInteger offset;
+
+  if ([event recurrenceId] != nil)
+    {
+      dateValue = [event startDate];
+      [dateValue setTimeZone: timeZone];
+      if (![event isAllDay])
+        {
+          offset = [timeZone secondsFromGMTForDate: dateValue];
+          dateValue = [dateValue dateByAddingYears: 0 months: 0 days: 0
+                                             hours: 0 minutes: 0
+                                           seconds: offset];
+        }
+      *data = [dateValue asFileTimeInMemCtx: localMemCtx];
+      rc = MAPISTORE_SUCCESS;
+    }
+  else
+    rc = MAPISTORE_ERR_NOT_FOUND;
+
+  return rc;
+}
+
+- (int) getPidTagExceptionEndTime: (void **) data
+                         inMemCtx: (TALLOC_CTX *) localMemCtx
+{
+  enum mapistore_error rc;
+  NSCalendarDate *dateValue;
+  NSInteger offset;
+
+  if ([event recurrenceId] != nil)
+    {
+      dateValue = [event startDate];
+      [dateValue setTimeZone: timeZone];
+      offset = [event durationAsTimeInterval];
+      if (![event isAllDay])
+        offset += [timeZone secondsFromGMTForDate: dateValue];
+      dateValue = [dateValue dateByAddingYears: 0 months: 0 days: 0
+                                         hours: 0 minutes: 0
+                                       seconds: offset];
+      *data = [dateValue asFileTimeInMemCtx: localMemCtx];
+      rc = MAPISTORE_SUCCESS;
+    }
+  else
+    rc = MAPISTORE_ERR_NOT_FOUND;
+
+  return rc;
+}
+
+/* subclasses */
+- (MAPIStoreCalendarEmbeddedMessage *) openEmbeddedMessage
+{
+  MAPIStoreCalendarEmbeddedMessage *msg;
+
+  msg = [MAPIStoreCalendarEmbeddedMessage
+          mapiStoreObjectInContainer: self];
+
+  return msg;
+}
+
+- (MAPIStoreCalendarEmbeddedMessage *) createEmbeddedMessage
+{
+  MAPIStoreCalendarEmbeddedMessage *msg;
+
+  msg = [self openEmbeddedMessage];
+  [msg setIsNew: YES];
+
+  return msg;
+}
+
+@end
@@ -0,0 +1,32 @@
+/* MAPIStoreCalendarContext.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTORECALENDARCONTEXT_H
+#define MAPISTORECALENDARCONTEXT_H
+
+#import "MAPIStoreGCSBaseContext.h"
+
+@interface MAPIStoreCalendarContext : MAPIStoreGCSBaseContext
+
+@end
+
+#endif /* MAPISTORECALENDARCONTEXT_H */
@@ -0,0 +1,64 @@
+/* MAPIStoreCalendarContext.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSString.h>
+#import <Appointments/SOGoAppointmentFolders.h>
+
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreCalendarFolder.h"
+#import "MAPIStoreUserContext.h"
+
+#import "MAPIStoreCalendarContext.h"
+
+#undef DEBUG
+#include <mapistore/mapistore.h>
+
+static Class MAPIStoreCalendarFolderK;
+
+@implementation MAPIStoreCalendarContext
+
+ (void) initialize
+{
+  MAPIStoreCalendarFolderK = [MAPIStoreCalendarFolder class];
+}
+
+ (NSString *) MAPIModuleName
+{
+  return @"calendar";
+}
+
+ (enum mapistore_context_role) MAPIContextRole
+{
+  return MAPISTORE_CALENDAR_ROLE;
+}
+
+- (Class) MAPIStoreFolderClass
+{
+  return MAPIStoreCalendarFolderK;
+}
+
+ (NSString *) folderNameSuffix
+{
+  return @"c";
+}
+
+@end
@@ -0,0 +1,34 @@
+/* MAPIStoreCalendarEmbeddedMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTORECALENDAREMBEDDEDMESSAGE_H
+#define MAPISTORECALENDAREMBEDDEDMESSAGE_H
+
+#import "MAPIStoreEmbeddedMessage.h"
+
+@class MAPIStoreAppointmentWrapper;
+
+@interface MAPIStoreCalendarEmbeddedMessage : MAPIStoreEmbeddedMessage
+
+@end
+
+#endif /* MAPISTORECALENDAREMBEDDEDMESSAGE_H */
@@ -0,0 +1,215 @@
+/* MAPIStoreCalendarEmbeddedMessage.m - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#include <talloc.h>
+
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <SOGo/SOGoUser.h>
+#import "iCalEvent+MAPIStore.h"
+
+#import "MAPIStoreAppointmentWrapper.h"
+#import "MAPIStoreCalendarAttachment.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreUserContext.h"
+#import "MAPIStoreTypes.h"
+#import "NSObject+MAPIStore.h"
+
+#import "MAPIStoreCalendarEmbeddedMessage.h"
+
+#include <mapistore/mapistore_errors.h>
+
+@implementation MAPIStoreCalendarEmbeddedMessage
+
+- (id) initInContainer: (id) newContainer
+{
+  MAPIStoreContext *context;
+  MAPIStoreUserContext *userContext;
+  MAPIStoreAppointmentWrapper *appointmentWrapper;
+
+  if ((self = [super initInContainer: newContainer]))
+    {
+      context = [self context];
+      userContext = [self userContext];
+      appointmentWrapper
+        = [MAPIStoreAppointmentWrapper
+                wrapperWithICalEvent: [newContainer event]
+                             andUser: [userContext sogoUser]
+                      andSenderEmail: nil
+                          inTimeZone: [userContext timeZone]
+                  withConnectionInfo: [context connectionInfo]];
+      [self addProxy: appointmentWrapper];
+    }
+
+  return self;
+}
+
+- (NSDate *) creationTime
+{
+  return [[container event] created];
+}
+
+- (NSDate *) lastModificationTime
+{
+  return [[container event] lastModified];
+}
+
+- (void) getMessageData: (struct mapistore_message **) dataPtr
+               inMemCtx: (TALLOC_CTX *) memCtx
+{
+  struct mapistore_message *msgData;
+
+  [super getMessageData: &msgData inMemCtx: memCtx];
+
+  /* HACK: we know the first (and only) proxy is our appointment wrapper
+     instance, but this might not always be true */
+  [[proxies objectAtIndex: 0] fillMessageData: msgData
+                                     inMemCtx: memCtx];
+  *dataPtr = msgData;
+}
+
+- (int) 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
+{
+  *data = MAPILongValue (memCtx, MSGFLAG_UNMODIFIED);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getYes: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagResponseRequested: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getYes: data inMemCtx: memCtx];
+}
+
+/* discarded properties */
+
+- (int) getPidLidAppointmentLastSequence: (void **)
+                                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidLidMeetingWorkspaceUrl: (void **)
+                            inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidLidContacts: (void **)
+                 inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagSensitivity: (void **)
+                    inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidLidPrivate: (void **)
+                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidNameKeywords: (void **)
+                  inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidLidFExceptionalBody: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getNo: data inMemCtx: memCtx];
+}
+
+- (void) save: (TALLOC_CTX *) memCtx
+{
+// (gdb) po embeddedMessage->properties
+// 2442592320 = "2012-07-11 22:30:00 +0000";
+// 2448359488 = "2012-07-11 22:30:00 +0000";
+// 2442723392 = "2012-07-11 22:30:00 +0000";
+// 2442068032 = "2012-07-11 22:30:00 +0000";
+// 2441740352 = "2012-07-11 23:00:00 +0000";
+//  131083 = 1; 2442330115 = 2;
+// 235339779 = 9;
+// 6291520 = "2012-07-11 16:00:00 +0000";
+// 2442526784 = "2012-07-11 23:00:00 +0000";
+// 2818059 = 0;
+// 1703967 = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
+//  3538947 = 0;
+// 1071513603 = 28591; 805830720 = "2012-07-10 16:42:00 +0000";
+//  2485977346 = <02013000 02001500 45006100 73007400
+// 65007200 6e002000 53007400 61006e00 64006100 72006400 20005400 69006d00
+// 65000200 02013e00 0000d607 00000000 00000000 00000000 00002c01 00000000
+// 0000c4ff ffff0000 0a000000 05000200 00000000 00000000 04000000 01000200
+// 00000000 00000201 3e000200 d7070000 00000000 00000000 00000000 2c010000
+// 00000000 c4ffffff 00000b00 00000100 02000000 00000000 00000300 00000200
+// 02000000 00000000>; 2454257728 = "2012-07-11 16:00:00 +0000"; 2442985475 =
+// 118330; 1507331 = 1; 805765184 = "2012-07-09 18:32:00 +0000"; 2442657856 =
+// "2012-07-11 23:00:00 +0000"; 2443051039 = "11.0"; 236912651 = 1; 2485911810 =
+// <02013000 02001500 45006100 73007400 65007200 6e002000 53007400 61006e00
+// 64006100 72006400 20005400 69006d00 65000200 02013e00 0000d607 00000000
+// 00000000 00000000 00002c01 00000000 0000c4ff ffff0000 0a000000 05000200
+// 00000000 00000000 04000000 01000200 00000000 00000201 3e000200 d7070000
+// 00000000 00000000 00000000 2c010000 00000000 c4ffffff 00000b00 00000100
+// 02000000 00000000 00000300 00000200 02000000 00000000>; 2441543683 = 30;
+// 2442068032 = "2012-07-11 22:30:00 +0000";
+// 1073348639 = "OpenChange User";
+// 806027522 = <2d64f6f5 89a59243 992d29d1 49173b3a>; 6357056 = "2012-07-11
+// 16:30:00 +0000"; 
+//   */
+
+// // 0x92490040 = 2454257728
+
+// }
+
+  SOGoUser *activeUser;
+
+  activeUser = [[self context] activeUser];
+
+  [[container event] updateFromMAPIProperties: properties
+                                inUserContext: [self userContext]
+                               withActiveUser: activeUser
+				     inMemCtx: memCtx];
+}
+
+@end
@@ -0,0 +1,32 @@
+/* MAPIStoreCalendarFolder.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTORECALENDARFOLDER_H
+#define MAPISTORECALENDARFOLDER_H
+
+#import "MAPIStoreGCSFolder.h"
+
+@interface MAPIStoreCalendarFolder : MAPIStoreGCSFolder
+
+@end
+
+#endif /* MAPISTORECALENDARFOLDER_H */
@@ -0,0 +1,180 @@
+/* MAPIStoreCalendarFolder.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSString.h>
+#import <Foundation/NSURL.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoPermissions.h>
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentFolders.h>
+#import <Appointments/SOGoAppointmentObject.h>
+
+#import "MAPIApplication.h"
+#import "MAPIStoreCalendarContext.h"
+#import "MAPIStoreCalendarMessage.h"
+#import "MAPIStoreCalendarMessageTable.h"
+#import "MAPIStoreUserContext.h"
+#import "NSString+MAPIStore.h"
+
+#import "MAPIStoreCalendarFolder.h"
+
+#include <mapistore/mapistore_errors.h>
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
+
+@implementation MAPIStoreCalendarFolder
+
+- (MAPIStoreMessageTable *) messageTable
+{
+  [self synchroniseCache];
+  return [MAPIStoreCalendarMessageTable tableForContainer: self];
+}
+
+- (NSString *) component
+{
+  return @"vevent";
+}
+
+- (MAPIStoreMessage *) createMessage
+{
+  MAPIStoreMessage *newMessage;
+  SOGoAppointmentObject *newEntry;
+  NSString *name;
+
+  //[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];
+
+  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
+{
+  NSMutableArray *roles;
+
+  roles = [NSMutableArray arrayWithCapacity: 6];
+  if (rights & RightsCreateItems)
+    [roles addObject: SOGoRole_ObjectCreator];
+  if (rights & RightsDeleteAll)
+    [roles addObject: SOGoRole_ObjectEraser];
+  if (rights & RightsEditAll)
+    {
+      [roles addObject: SOGoCalendarRole_PublicModifier];
+      [roles addObject: SOGoCalendarRole_PrivateModifier];
+      [roles addObject: SOGoCalendarRole_ConfidentialModifier];
+    }
+  else if (rights & RightsReadItems)
+    {
+      [roles addObject: SOGoCalendarRole_PublicViewer];
+      [roles addObject: SOGoCalendarRole_PrivateViewer];
+      [roles addObject: SOGoCalendarRole_ConfidentialViewer];
+    }
+
+  // [self logWithFormat: @"roles for rights %.8x = (%@)", rights, roles];
+
+  return roles;
+}
+
+- (uint32_t) exchangeRightsForRoles: (NSArray *) roles
+{
+  uint32_t rights = 0;
+
+  if ([roles containsObject: SOGoRole_ObjectCreator])
+    rights |= RightsCreateItems;
+  if ([roles containsObject: SOGoRole_ObjectEraser])
+    rights |= RightsDeleteAll;
+  if ([roles containsObject: SOGoCalendarRole_PublicModifier]
+      && [roles containsObject: SOGoCalendarRole_PrivateModifier]
+      && [roles containsObject: SOGoCalendarRole_ConfidentialModifier])
+    rights |= RightsReadItems | RightsEditAll;
+  else if ([roles containsObject: SOGoCalendarRole_PublicViewer]
+           && [roles containsObject: SOGoCalendarRole_PrivateViewer]
+           && [roles containsObject: SOGoCalendarRole_ConfidentialViewer])
+    rights |= RightsReadItems | 0x1800;
+  if (rights != 0)
+    rights |= RoleNone; /* actually "folder visible" */
+
+  // [self logWithFormat: @"rights for roles (%@) = %.8x", roles, rights];
+ 
+  return rights;
+}
+
+- (BOOL) subscriberCanReadMessages
+{
+  static NSArray *viewerRoles = nil;
+
+  if (!viewerRoles)
+    viewerRoles = [[NSArray alloc] initWithObjects:
+                                     SOGoCalendarRole_PublicViewer,
+                                   SOGoCalendarRole_PublicDAndTViewer,
+                                   SOGoCalendarRole_PrivateViewer,
+                                   SOGoCalendarRole_PrivateDAndTViewer,
+                                   SOGoCalendarRole_ConfidentialViewer,
+                                   SOGoCalendarRole_ConfidentialDAndTViewer,
+                                   nil];
+
+  return ([[self activeUserRoles] firstObjectCommonWithArray: viewerRoles]
+          != nil);
+}
+
+- (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);
+}
+
+- (EOQualifier *) aclQualifier
+{
+  return [EOQualifier qualifierWithQualifierFormat:
+            [(SOGoAppointmentFolder *) sogoObject aclSQLListingFilter]];
+}
+
+- (int) getPidTagDefaultPostMessageClass: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [@"IPM.Appointment" asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+@end
@@ -0,0 +1,40 @@
+/* MAPIStoreCalendarMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTORECALENDARMESSAGE_H
+#define MAPISTORECALENDARMESSAGE_H
+
+#import "MAPIStoreGCSMessage.h"
+
+@class iCalCalendar;
+@class iCalEvent;
+@class MAPIStoreAppointmentWrapper;
+
+@interface MAPIStoreCalendarMessage : MAPIStoreGCSMessage
+{
+  iCalCalendar *calendar;
+  iCalEvent *masterEvent;
+}
+
+@end
+
+#endif /* MAPISTORECALENDARMESSAGE_H */
@@ -0,0 +1,698 @@
+/* MAPIStoreCalendarMessage.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+/* TODO:
+   - merge common code with tasks
+   - take the tz definitions from Outlook */
+
+#include <talloc.h>
+#include <util/attr.h>
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOFetchSpecification.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <GDLContentStore/GCSFolder.h>
+#import <NGCards/iCalAlarm.h>
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTimeZone.h>
+#import <NGCards/iCalTrigger.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserManager.h>
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentObject.h>
+#import <Appointments/iCalEntityObject+SOGo.h>
+#import <Mailer/NSString+Mail.h>
+
+#import "iCalEvent+MAPIStore.h"
+#import "MAPIStoreAppointmentWrapper.h"
+#import "MAPIStoreCalendarAttachment.h"
+#import "MAPIStoreCalendarFolder.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreRecurrenceUtils.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
+#import "NSDate+MAPIStore.h"
+#import "NSData+MAPIStore.h"
+#import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"
+#import "NSValue+MAPIStore.h"
+
+#import "MAPIStoreCalendarMessage.h"
+
+#undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <gen_ndr/property.h>
+#include <libmapi/libmapi.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
+
+// extern void ndr_print_AppointmentRecurrencePattern(struct ndr_print *ndr, const char *name, const struct AppointmentRecurrencePattern *r);
+
+static Class NSArrayK;
+
+@implementation SOGoAppointmentObject (MAPIStoreExtension)
+
+- (Class) mapistoreMessageClass
+{
+  return [MAPIStoreCalendarMessage class];
+}
+
+@end
+
+@implementation MAPIStoreCalendarMessage
+
+ (void) initialize
+{
+  NSArrayK = [NSArray class];
+}
+
+ (enum mapistore_error) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                                       inMemCtx: (TALLOC_CTX *) memCtx
+{
+  BOOL listedProperties[65536];
+  NSUInteger count;
+  uint16_t propId;
+
+  memset (listedProperties, NO, 65536 * sizeof (BOOL));
+  [super getAvailableProperties: propertiesP inMemCtx: memCtx];
+  for (count = 0; count < (*propertiesP)->cValues; count++)
+    {
+      propId = ((*propertiesP)->aulPropTag[count] >> 16) & 0xffff;
+      listedProperties[propId] = YES;
+    }
+  [MAPIStoreAppointmentWrapper fillAvailableProperties: *propertiesP
+                                        withExclusions: listedProperties];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      calendar = nil;
+      masterEvent = nil;
+    }
+
+  return self;
+}
+
+- (void) _setupAttachmentParts
+{
+  NSUInteger count, max;
+  NSArray *events;
+  NSString *newKey;
+  MAPIStoreCalendarAttachment *attachment;
+  NSUInteger aid;
+  iCalEvent *event;
+
+  events = [calendar events];
+  max = [events count];
+  for (count = 1; count < max; count++)
+    {
+      attachment = [MAPIStoreCalendarAttachment
+                      mapiStoreObjectInContainer: self];
+      /* we now that there are no attachments yet, so we can assume that the
+         right AID is 0 from the start */
+      aid = count - 1;
+      [attachment setAID: aid];
+      event = [events objectAtIndex: count];
+      [attachment setEvent: event];
+      newKey = [[event uniqueChildWithTag: @"recurrence-id"]
+                 flattenedValuesForKey: @""];
+      [attachmentParts setObject: attachment forKey: newKey];
+    }
+}
+
+- (id) initWithSOGoObject: (id) newSOGoObject
+              inContainer: (MAPIStoreObject *) newFolder
+{
+  MAPIStoreContext *context;
+  MAPIStoreUserContext *userContext;
+  iCalCalendar *origCalendar;
+  MAPIStoreAppointmentWrapper *appointmentWrapper;
+
+  if ((self = [super initWithSOGoObject: newSOGoObject
+                            inContainer: newFolder]))
+    {
+      if ([newSOGoObject isNew])
+        {
+          ASSIGN (calendar, [iCalCalendar groupWithTag: @"vcalendar"]);
+          [calendar setVersion: @"2.0"];
+          [calendar setProdID: @"-//Inverse inc.//OpenChange+SOGo//EN"];
+          masterEvent = [iCalEvent groupWithTag: @"vevent"];
+          [calendar addChild: masterEvent];
+          [masterEvent setCreated: [NSCalendarDate date]];
+        }
+      else
+        {
+          origCalendar = [sogoObject calendar: YES secure: YES];
+          calendar = [origCalendar mutableCopy];
+          masterEvent = [[calendar events] objectAtIndex: 0];
+          [self _setupAttachmentParts];
+        }
+      context = [self context];
+      userContext = [self userContext];
+      appointmentWrapper
+        = [MAPIStoreAppointmentWrapper wrapperWithICalEvent: masterEvent
+                                                    andUser: [userContext sogoUser]
+                                             andSenderEmail: nil
+                                                 inTimeZone: [userContext timeZone]
+                                         withConnectionInfo: [context connectionInfo]];
+      [self addProxy: appointmentWrapper];
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  //NSLog(@"MAPIStoreCalendarMessage: -dealloc (%p)", self);
+  [calendar release];
+  [super dealloc];
+}
+
+/* getters */
+- (int) getPidLidFInvited: (void **) data
+                 inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getYes: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagMessageClass: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
+{
+  SOGoUser *owner;
+
+  owner = [[self userContext] sogoUser];
+  if ([masterEvent userAsAttendee: owner])
+    *data = talloc_strdup (memCtx, "IPM.Schedule.Meeting.Request");
+  else
+    *data = talloc_strdup (memCtx, "IPM.Appointment");
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidLidSideEffects: (void **) data // TODO
+                    inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = MAPILongValue (memCtx,
+                         seOpenToDelete | seOpenToCopy | seOpenToMove
+                         | seCoerceToInbox | seOpenForCtxMenu);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagProcessed: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getYes: data inMemCtx: memCtx];
+}
+
+- (void) getMessageData: (struct mapistore_message **) dataPtr
+               inMemCtx: (TALLOC_CTX *) memCtx
+{
+  static NSString *recTypes[] = {@"orig", @"to", @"cc", @"bcc"};
+  static NSInteger recTypesValue[] = {MAPI_ORIG, MAPI_TO, MAPI_CC, MAPI_BCC};
+  struct mapistore_message *msgData;
+  NSDictionary *recipients, *contactInfos;
+  NSString *email;
+  NSArray *attendees;
+  NSDictionary *attendee;
+  SOGoUserManager *mgr;
+  struct mapistore_message_recipient *recipient;
+  NSUInteger nRecType, maxRecTypes, count, max, propCount;
+  NSObject *currentValue;
+
+  [super getMessageData: &msgData inMemCtx: memCtx];
+
+  /* The presence of the "recipients" meta-property means that our most recent
+     list of recipients has not been saved yet and that we must return that
+     one instead of the one stored in the event. */
+  recipients = [properties objectForKey: @"recipients"];
+  if (recipients)
+    {
+      mgr = [SOGoUserManager sharedUserManager];
+
+      /* TODO: this code might need to be moved into MAPIStoreMessage */
+      msgData->columns = set_SPropTagArray (msgData, 9,
+                                            PR_OBJECT_TYPE,
+                                            PR_DISPLAY_TYPE,
+                                            PR_7BIT_DISPLAY_NAME_UNICODE,
+                                            PR_SMTP_ADDRESS_UNICODE,
+                                            PR_SEND_INTERNET_ENCODING,
+                                            PR_RECIPIENT_DISPLAY_NAME_UNICODE,
+                                            PR_RECIPIENT_FLAGS,
+                                            PR_RECIPIENT_ENTRYID,
+                                            PR_RECIPIENT_TRACKSTATUS);
+
+      maxRecTypes = sizeof(recTypes) / sizeof(recTypes[0]);
+      for (nRecType = 0; nRecType < maxRecTypes; nRecType++)
+        {
+          attendees = [recipients objectForKey: recTypes[nRecType]];
+          max = [attendees count];
+          if (max > 0)
+            {
+              msgData->recipients_count += max;
+              msgData->recipients = talloc_realloc(msgData,
+                                                   msgData->recipients, struct
+                                                   mapistore_message_recipient, msgData->recipients_count);
+              recipient = msgData->recipients;
+              for (count = 0; count < max; count++)
+                {
+                  attendee = [attendees objectAtIndex: count];
+                  recipient->type = recTypesValue[nRecType];
+                  email = [attendee objectForKey: @"email"];
+                  if (email)
+                    {
+                      contactInfos
+                        = [mgr contactInfosForUserWithUIDorEmail: email];
+                      recipient->username = [[contactInfos
+                                               objectForKey: @"c_uid"]
+                                              asUnicodeInMemCtx: msgData];
+                    }
+                  else
+                    recipient->username = NULL;
+
+                  recipient->data = talloc_array(msgData, void *,
+                                                 msgData->columns->cValues);
+                  for (propCount = 0;
+                       propCount < msgData->columns->cValues;
+                       propCount++)
+                    {
+                      currentValue = [attendee objectForKey: MAPIPropertyKey (msgData->columns->aulPropTag[propCount])];
+                      [currentValue getValue: recipient->data + propCount
+                                      forTag: msgData->columns->aulPropTag[propCount]
+                                    inMemCtx: msgData];
+                    }
+                  recipient++;
+                }
+            }
+        }
+    }
+  else
+    {
+      /* HACK: we know the first (and only) proxy is our appointment wrapper
+         instance, but this might not always be true */
+      [[proxies objectAtIndex: 0] fillMessageData: msgData
+                                  inMemCtx: memCtx];
+    }
+
+  *dataPtr = msgData;
+}
+
+/* sender representing */
+// - (int) getPidTagSentRepresentingEmailAddress: (void **) data
+//                                      inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagSenderEmailAddress: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagSentRepresentingAddressType: (void **) data
+//                                     inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getSMTPAddrType: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagSentRepresentingName: (void **) data
+//                              inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagSenderName: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagSentRepresentingEntryId: (void **) data
+//                                 inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagSenderEntryId: data inMemCtx: memCtx];
+// }
+
+/* attendee */
+// - (int) getPidTagReceivedByAddressType: (void **) data
+//                        inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByAddressType: data
+//                                                    inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedByEmailAddress: (void **) data
+//                            inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByEmailAddress: data
+//                                                        inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedByName: (void **) data
+//                    inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByName: data
+//                                                inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedByEntryId: (void **) data
+//                       inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [appointmentWrapper getPidTagReceivedByEntryId: data
+//                                                   inMemCtx: memCtx];
+// }
+
+// /* attendee representing */
+// - (int) getPidTagReceivedRepresentingEmailAddress: (void **) data
+//                                  inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagReceivedByEmailAddress: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedRepresentingAddressType: (void **) data
+//                              inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getSMTPAddrType: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedRepresentingName: (void **) data
+//                          inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagReceivedByName: data inMemCtx: memCtx];
+// }
+
+// - (int) getPidTagReceivedRepresentingEntryId: (void **) data
+//                             inMemCtx: (TALLOC_CTX *) memCtx
+// {
+//   return [self getPidTagReceivedByEntryId: data inMemCtx: memCtx];
+// }
+
+- (int) getPidTagResponseRequested: (void **) data
+                          inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getYes: data inMemCtx: memCtx];
+}
+
+- (NSString *) _uidFromGlobalObjectId: (TALLOC_CTX *) memCtx 
+{
+  NSData *objectId;
+  NSString *uid = nil;
+  char *bytesDup, *uidStart;
+  NSUInteger length;
+
+  /* NOTE: we only handle the generic case at the moment, see
+     MAPIStoreAppointmentWrapper */
+  objectId = [properties
+               objectForKey: MAPIPropertyKey (PidLidGlobalObjectId)];
+  if (objectId)
+    {
+      length = [objectId length];
+      bytesDup = talloc_array (memCtx, char, length + 1);
+      memcpy (bytesDup, [objectId bytes], length);
+      bytesDup[length] = 0;
+      uidStart = bytesDup + length - 1;
+      while (uidStart != bytesDup && *(uidStart - 1))
+        uidStart--;
+      if (uidStart > bytesDup && *uidStart)
+        uid = [NSString stringWithUTF8String: uidStart];
+      talloc_free (bytesDup);
+    }
+
+  return uid;
+}
+
+- (SOGoAppointmentObject *) _resurrectRecord: (NSString *) cname
+                                  fromFolder: (SOGoAppointmentFolder *) folder
+{
+  NSArray *records;
+  EOQualifier *qualifier;
+  EOFetchSpecification *fs;
+  GCSFolder *ocsFolder;
+  SOGoAppointmentObject *newObject;
+  NSMutableDictionary *newRecord;
+  static NSArray *childRecordFields = nil;
+
+  if (!childRecordFields)
+    {
+      childRecordFields = [NSArray arrayWithObjects: @"c_name",
+				   @"c_creationdate", @"c_lastmodified",
+				   @"c_content", nil];
+      [childRecordFields retain];
+    }
+
+  ocsFolder = [folder ocsFolder];
+
+  qualifier
+    = [EOQualifier qualifierWithQualifierFormat:
+                     [NSString stringWithFormat: @"c_name='%@'", cname]];
+  fs = [EOFetchSpecification fetchSpecificationWithEntityName: [ocsFolder folderName]
+                                                    qualifier: qualifier
+                                                sortOrderings: nil];
+  records = [ocsFolder fetchFields: childRecordFields
+                fetchSpecification: fs
+                     ignoreDeleted: NO];
+  if ([records isKindOfClass: NSArrayK] && [records count])
+    {
+      newRecord = [[records objectAtIndex: 0] mutableCopy];
+      [newRecord setObject: [NSNumber numberWithInt: 0]
+                    forKey: @"c_version"];
+      newObject = [SOGoAppointmentObject objectWithRecord: newRecord
+                                              inContainer: folder];
+      [newRecord autorelease];
+      [newObject setIsNew: NO];
+    }
+  else
+    newObject = nil;
+
+
+  return newObject;
+}
+
+- (void) _fixupAppointmentObjectWithUID: (NSString *) uid
+{
+  NSString *cname, *url;
+  MAPIStoreMapping *mapping;
+  uint64_t objectId;
+  WOContext *woContext;
+  SOGoAppointmentFolder *folder;
+  SOGoAppointmentObject *newObject;
+
+  cname = [[container sogoObject] resourceNameForEventUID: uid];
+  if (cname)
+    isNew = NO;
+  else
+    cname = [NSString stringWithFormat: @"%@.ics", uid];
+
+  mapping = [self mapping];
+
+  url = [NSString stringWithFormat: @"%@%@", [container url], cname];
+  folder = [sogoObject container];
+
+  /* reinstantiate the old sogo object and attach it to self */
+  woContext = [[self userContext] woContext];
+  if (isNew)
+    {
+      /* event could have been deleted, let's try to resurrect it */
+      newObject = [self _resurrectRecord: cname fromFolder: folder];
+      if (!newObject)
+        {
+          newObject = [SOGoAppointmentObject objectWithName: cname
+                                                inContainer: folder];
+          [newObject setIsNew: YES];
+        }
+    }
+  else
+    {
+      /* dissociate the object url from the old object's id */
+      objectId = [mapping idFromURL: url];
+      [mapping unregisterURLWithID: objectId];
+      newObject = [folder lookupName: cname
+                           inContext: woContext
+                             acquire: NO];
+    }
+
+  /* dissociate the object url associated with this object, as we want to
+     discard it */
+  objectId = [self objectId];
+  [mapping unregisterURLWithID: objectId];
+      
+  /* associate the new object url with this object id */
+  [mapping registerURL: url withID: objectId];
+
+  [newObject setContext: woContext];
+  ASSIGN (sogoObject, newObject);
+}
+
+- (BOOL) subscriberCanReadMessage
+{
+  NSArray *roles;
+
+  roles = [self activeUserRoles];
+
+  return ([roles containsObject: SOGoCalendarRole_ComponentViewer]
+          || [roles containsObject: SOGoCalendarRole_ComponentDAndTViewer]
+          || [self subscriberCanModifyMessage]);
+}
+
+- (BOOL) subscriberCanModifyMessage
+{
+  BOOL rc;
+  NSArray *roles = [self activeUserRoles];
+
+  if (isNew)
+    rc = [roles containsObject: SOGoRole_ObjectCreator];
+  else
+    rc = ([roles containsObject: SOGoCalendarRole_ComponentModifier]
+          || [roles containsObject: SOGoCalendarRole_ComponentResponder]);
+
+  return rc;
+}
+
+- (void) _updateAttachedEvents
+{
+  NSArray *allAttachments;
+  NSUInteger count, max;
+  NSString *uid, *summary;
+  iCalEvent *event;
+  MAPIStoreCalendarAttachment *attachment;
+
+  /* ensure that all exception events have the same UID as the master */
+  uid = [masterEvent uid];
+  summary = [masterEvent summary];
+
+  allAttachments = [attachmentParts allValues];
+  max = [allAttachments count];
+  for (count = 0; count < max; count++)
+    {
+      attachment = [allAttachments objectAtIndex: count];
+      event = [attachment event];
+      if ([[event summary] length] == 0)
+        [event setSummary: summary];
+      [event setUid: uid];
+    }
+}
+
+- (void) save: (TALLOC_CTX *) memCtx 
+{
+  // iCalCalendar *vCalendar;
+  // NSCalendarDate *now;
+  NSString *uid, *nameInContainer;
+  // iCalEvent *newEvent;
+  // iCalPerson *userPerson;
+  SOGoUser *activeUser;
+  NSRange rangeOfDot;
+
+  if (isNew)
+    {
+      uid = [self _uidFromGlobalObjectId: memCtx];
+      if (uid)
+        {
+          /* Hack required because of what's explained in oxocal 3.1.4.7.1:
+             basically, Outlook creates a copy of the event and then removes
+             the old instance. We perform a trickery to avoid performing those
+             operations in the backend, in a way that enables us to recover
+             the initial instance and act solely on it. */
+          [self _fixupAppointmentObjectWithUID: uid];
+        }
+      else
+        {
+          /* We create a UID from the nameInContainer, or the reverse if the
+             latter is already set... */
+          nameInContainer = [sogoObject nameInContainer];
+          if (nameInContainer)
+            {
+              rangeOfDot = [nameInContainer rangeOfString: @"."
+                                                  options: NSBackwardsSearch];
+              if (rangeOfDot.location == NSNotFound)
+                uid = nameInContainer;
+              else
+                uid = [nameInContainer substringToIndex: rangeOfDot.location];
+            }
+          else
+            {
+              uid = [SOGoObject globallyUniqueObjectId];
+              nameInContainer = [NSString stringWithFormat: @"%@.ics", uid];
+              [sogoObject setNameInContainer: nameInContainer];
+            }
+        }
+      [masterEvent setUid: uid];
+    }
+
+  // [self logWithFormat: @"-save, event props:"];
+  // MAPIStoreDumpMessageProperties (newProperties);
+
+  // now = [NSCalendarDate date];
+
+  activeUser = [[self context] activeUser];
+  [masterEvent updateFromMAPIProperties: properties
+                          inUserContext: [self userContext]
+                         withActiveUser: activeUser
+	                       inMemCtx: memCtx];
+  [self _updateAttachedEvents];
+  [[self userContext] activateWithUser: activeUser];
+  [sogoObject updateContentWithCalendar: calendar
+                            fromRequest: nil];
+  [self updateVersions];
+}
+
+- (id) lookupAttachment: (NSString *) childKey
+{
+  return [attachmentParts objectForKey: childKey];
+}
+
+- (MAPIStoreAttachment *) createAttachment
+{
+  MAPIStoreCalendarAttachment *newAttachment;
+  uint32_t newAid;
+  NSString *newKey;
+  iCalEvent *newEvent;
+
+  newAid = [[self attachmentKeys] count];
+
+  newAttachment = [MAPIStoreCalendarAttachment
+                    mapiStoreObjectInContainer: self];
+  [newAttachment setAID: newAid];
+  newEvent = [iCalEvent groupWithTag: @"vevent"];
+  [newAttachment setEvent: newEvent];
+  [calendar addToEvents: newEvent];
+
+  newKey = [NSString stringWithFormat: @"%ul", newAid];
+  [attachmentParts setObject: newAttachment
+                      forKey: newKey];
+  [attachmentKeys release];
+  attachmentKeys = nil;
+
+  return newAttachment;
+}
+
+- (int) setReadFlag: (uint8_t) flag
+{
+  return MAPISTORE_SUCCESS;
+}
+
+@end
@@ -0,0 +1,32 @@
+/* MAPIStoreCalendarMessageTable.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTORECALENDARMESSAGETABLE_H
+#define MAPISTORECALENDARMESSAGETABLE_H
+
+#import "MAPIStoreGCSMessageTable.h"
+
+@interface MAPIStoreCalendarMessageTable : MAPIStoreGCSMessageTable
+
+@end
+
+#endif /* MAPISTORECALENDARMESSAGETABLE_H */
@@ -0,0 +1,190 @@
+/* MAPIStoreCalendarMessageTable.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSDictionary.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
+
+#import <EOControl/EOQualifier.h>
+
+#import <NGCards/iCalEvent.h>
+
+#import "MAPIStoreCalendarMessage.h"
+#import "MAPIStoreTypes.h"
+#import "NSDate+MAPIStore.h"
+#import "NSString+MAPIStore.h"
+
+#import "MAPIStoreCalendarMessageTable.h"
+
+#include <mapistore/mapistore_nameid.h>
+
+static Class MAPIStoreCalendarMessageK = Nil;
+
+@implementation MAPIStoreCalendarMessageTable
+
+ (void) initialize
+{
+  MAPIStoreCalendarMessageK = [MAPIStoreCalendarMessage class];
+}
+
+ (Class) childObjectClass
+{
+  return MAPIStoreCalendarMessageK;
+}
+
+- (EOQualifier *) _orgMailNotNullQualifier
+{
+  static EOQualifier *orgMailQualifier = nil;
+  EOQualifier *notNullQualifier, *nullQualifier, *notEmptyQualifier, *emptyQualifier;
+
+  if (!orgMailQualifier)
+    {
+      nullQualifier = [[EOKeyValueQualifier alloc]
+                                initWithKey: @"c_orgmail"
+                           operatorSelector: EOQualifierOperatorEqual
+                                      value: [NSNull null]];
+      notNullQualifier = [[EONotQualifier alloc]
+                           initWithQualifier: nullQualifier];
+      emptyQualifier = [[EOKeyValueQualifier alloc]
+                                initWithKey: @"c_orgmail"
+                           operatorSelector: EOQualifierOperatorEqual
+                                      value: @""];
+      notEmptyQualifier = [[EONotQualifier alloc]
+                           initWithQualifier: emptyQualifier];
+      orgMailQualifier = [[EOAndQualifier alloc]
+                           initWithQualifiers: notNullQualifier,
+                           notEmptyQualifier, nil];
+      [nullQualifier release];
+      [notNullQualifier release];
+      [emptyQualifier release];
+      [notEmptyQualifier release];
+    }
+
+  return orgMailQualifier;
+}
+
+- (MAPIRestrictionState) evaluatePropertyRestriction: (struct mapi_SPropertyRestriction *) res
+				       intoQualifier: (EOQualifier **) qualifier
+{
+  MAPIRestrictionState rc;
+  id value;
+  NSMutableString *likeString;
+  NSString *likePartString;
+  EOAndQualifier *andQualifier, *stringQualifier;
+  union {
+    uint32_t longValue;
+    char charValue[4];
+  } apptIdValue;
+
+  value = NSObjectFromMAPISPropValue (&res->lpProp);
+  switch ((uint32_t) res->ulPropTag)
+    {
+    case PR_MESSAGE_CLASS_UNICODE:
+      if ([value isEqualToString: @"IPM.Appointment"])
+	rc = MAPIRestrictionStateAlwaysTrue;
+      else
+	rc = MAPIRestrictionStateAlwaysFalse;
+      break;
+    case PR_OWNER_APPT_ID:
+      // c_orgmail != NULL && c_orgmail != '' && c_uid like 'ab%89';
+      apptIdValue.longValue = [value unsignedLongValue];
+      likeString = [NSMutableString string];
+      likePartString = [[NSString alloc]
+                         initWithBytes: apptIdValue.charValue
+                                length: 2
+                              encoding: NSISOLatin1StringEncoding];
+      [likeString appendString: likePartString];
+      [likePartString release];
+      [likeString appendString: @"%%"];
+      likePartString = [[NSString alloc]
+                         initWithBytes: apptIdValue.charValue + 2
+                                length: 2
+                              encoding: NSISOLatin1StringEncoding];
+      [likeString appendString: likePartString];
+      [likePartString release];
+      stringQualifier = [[EOKeyValueQualifier alloc]
+                                initWithKey: @"c_uid"
+                           operatorSelector: EOQualifierOperatorLike
+                                      value: likeString];
+      andQualifier = [[EOAndQualifier alloc]
+                       initWithQualifiers: [self _orgMailNotNullQualifier],
+                       stringQualifier, nil];
+      [andQualifier autorelease];
+      [stringQualifier release];
+      *qualifier = andQualifier;
+      rc = MAPIRestrictionStateNeedsEval;
+      break;
+    case PidLidBusyStatus:
+      rc = MAPIRestrictionStateAlwaysTrue; // should be based on c_isopaque
+      break;
+    default:
+      rc = [super evaluatePropertyRestriction: res intoQualifier: qualifier];
+    }
+
+  return rc;
+}
+
+- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
+{
+  static NSMutableDictionary *knownProperties = nil;
+
+  if (!knownProperties)
+    {
+      knownProperties = [NSMutableDictionary new];
+      [knownProperties setObject: @"c_startdate"
+			  forKey: MAPIPropertyKey (PidLidAppointmentStartWhole)];
+      [knownProperties setObject: @"c_enddate"
+			  forKey: MAPIPropertyKey (PidLidAppointmentEndWhole)];
+      [knownProperties setObject: @"c_iscycle"
+			  forKey: MAPIPropertyKey (PidLidRecurring)];
+    }
+
+  return [knownProperties objectForKey: MAPIPropertyKey (property)];
+}
+
+/* sorting */
+
+- (NSString *) sortIdentifierForProperty: (enum MAPITAGS) property
+{
+  static NSMutableDictionary *knownProperties = nil;
+
+  if (!knownProperties)
+    {
+      knownProperties = [NSMutableDictionary new];
+      [knownProperties setObject: @"c_startdate"
+                          forKey: MAPIPropertyKey (PidLidAppointmentStartWhole)];
+      [knownProperties setObject: @"c_enddate"
+                          forKey: MAPIPropertyKey (PidLidAppointmentEndWhole)];
+      [knownProperties setObject: @"c_iscycle"
+                          forKey: MAPIPropertyKey (PidLidRecurring)];
+      [knownProperties setObject: @"c_isallday"
+                          forKey: MAPIPropertyKey (PidLidAppointmentSubType)];
+      [knownProperties setObject: @"c_creationdate"
+                          forKey: MAPIPropertyKey (PR_CREATION_TIME)];
+      [knownProperties setObject: @"c_uid"
+                          forKey: MAPIPropertyKey (PR_OWNER_APPT_ID)];
+    }
+
+  return [knownProperties objectForKey: MAPIPropertyKey (property)];
+}
+
+@end
@@ -0,0 +1,41 @@
+/* MAPIStoreContactsAttachment.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTORECONTACTSATTACHMENT_H
+#define MAPISTORECONTACTSATTACHMENT_H
+
+#import "MAPIStoreAttachment.h"
+
+@class NSData;
+@class NGVCardPhoto;
+
+@interface MAPIStoreContactsAttachment : MAPIStoreAttachment
+{
+  NGVCardPhoto *photo;
+  NSData *photoData;
+}
+
+- (void) setPhoto: (NGVCardPhoto *) newPhoto;
+
+@end
+
+#endif /* MAPISTORECONTACTSATTACHMENT_H */
@@ -0,0 +1,197 @@
+/* MAPIStoreContactsAttachment.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSCalendarDate.h>
+#import <Foundation/NSString.h>
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGCards/NGVCardPhoto.h>
+
+#import "MAPIStoreTypes.h"
+#import "NSData+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
+#import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"
+
+#import "MAPIStoreContactsAttachment.h"
+
+#include <mapistore/mapistore_errors.h>
+
+/* TODO: handle URL pictures via PidTagAttachMethod = ref ? */
+
+@implementation MAPIStoreContactsAttachment
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      photo = nil;
+      photoData = nil;
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  [photo release];
+  [photoData release];
+  [super dealloc];
+}
+
+- (void) setPhoto: (NGVCardPhoto *) newPhoto
+{
+  ASSIGN (photo, newPhoto);
+}
+
+- (NSString *) fileExtension
+{
+  NSString *type, *extension;
+
+  type = [photo type];
+  if ([type isEqualToString: @"JPEG"]
+      || [type isEqualToString: @"JPG"])
+    extension = @".jpg";
+  else if ([type isEqualToString: @"PNG"])
+    extension = @".png";
+  else if ([type isEqualToString: @"BMP"])
+    extension = @".bmp";
+  else if ([type isEqualToString: @"GIF"])
+    extension = @".gif";
+  else
+    extension = nil;
+
+  return extension;
+}
+
+- (NSDate *) creationTime
+{
+  return [container creationTime];
+}
+
+- (NSDate *) lastModificationTime
+{
+  return [container lastModificationTime];
+}
+
+- (int) getPidTagAttachEncoding: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
+{
+  *data = [[NSData data] asBinaryInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachFlags: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getLongZero: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagAttachmentFlags: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getLongZero: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagAttachmentHidden: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getNo: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagAttachmentLinkId: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getLongZero: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagAttachMethod: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = MAPILongValue (memCtx, 0x00000001);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachmentContactPhoto: (void **) data
+                               inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getYes: data inMemCtx: memCtx];
+}
+
+- (int) getPidTagAttachDataBinary: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
+{
+  if (!photoData)
+    ASSIGN (photoData,
+            [[photo flattenedValuesForKey: @""] dataByDecodingBase64]);
+
+  *data = [photoData asBinaryInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachSize: (void **) data
+                   inMemCtx: (TALLOC_CTX *) memCtx
+{
+  if (!photoData)
+    ASSIGN (photoData,
+            [[photo flattenedValuesForKey: @""] dataByDecodingBase64]);
+
+  *data = MAPILongValue (memCtx, [photoData length]);
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachExtension: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [[self fileExtension] asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachLongFilename: (void **) data
+                           inMemCtx: (TALLOC_CTX *) memCtx
+{
+  NSString *filename;
+
+  filename = [NSString stringWithFormat: @"ContactPhoto%@",
+                       [self fileExtension]];
+
+  *data = [filename asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getPidTagAttachFilename: (void **) data
+                       inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getPidTagAttachLongFilename: data
+                                  inMemCtx: memCtx];
+}
+
+- (int) getPidTagDisplayName: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getPidTagAttachLongFilename: data inMemCtx: memCtx];
+}
+
+@end
@@ -0,0 +1,32 @@
+/* MAPIStoreContactsContext.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTORECONTACTSCONTEXT_H
+#define MAPISTORECONTACTSCONTEXT_H
+
+#import "MAPIStoreGCSBaseContext.h"
+
+@interface MAPIStoreContactsContext : MAPIStoreGCSBaseContext
+
+@end
+
+#endif /* MAPISTORECONTACTSCONTEXT_H */
@@ -0,0 +1,59 @@
+/* MAPIStoreContactsContext.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSString.h>
+
+#import <Contacts/SOGoContactFolders.h>
+
+#import "MAPIStoreContactsFolder.h"
+#import "MAPIStoreUserContext.h"
+
+#import "MAPIStoreContactsContext.h"
+
+#undef DEBUG
+#include <mapistore/mapistore.h>
+
+static Class MAPIStoreContactsFolderK;
+
+@implementation MAPIStoreContactsContext
+
+ (void) initialize
+{
+  MAPIStoreContactsFolderK = [MAPIStoreContactsFolder class];
+}
+
+ (NSString *) MAPIModuleName
+{
+  return @"contacts";
+}
+
+ (enum mapistore_context_role) MAPIContextRole
+{
+  return MAPISTORE_CONTACTS_ROLE;
+}
+
+- (Class) MAPIStoreFolderClass
+{
+  return MAPIStoreContactsFolderK;
+}
+
+@end
@@ -0,0 +1,32 @@
+/* MAPIStoreContactsFolder.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTORECONTACTSFOLDER_H
+#define MAPISTORECONTACTSFOLDER_H
+
+#import "MAPIStoreGCSFolder.h"
+
+@interface MAPIStoreContactsFolder : MAPIStoreGCSFolder
+
+@end
+
+#endif /* MAPISTORECONTACTSFOLDER_H */
@@ -0,0 +1,125 @@
+/* MAPIStoreContactsFolder.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSURL.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoPermissions.h>
+#import <Contacts/SOGoContactGCSEntry.h>
+#import <Contacts/SOGoContactFolders.h>
+
+#import "MAPIApplication.h"
+#import "MAPIStoreContactsContext.h"
+#import "MAPIStoreContactsMessage.h"
+#import "MAPIStoreContactsMessageTable.h"
+#import "NSString+MAPIStore.h"
+
+#import "MAPIStoreContactsFolder.h"
+
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore_errors.h>
+
+@implementation MAPIStoreContactsFolder
+
+- (MAPIStoreMessageTable *) messageTable
+{
+  [self synchroniseCache];
+  return [MAPIStoreContactsMessageTable tableForContainer: self];
+}
+
+- (NSString *) component
+{
+  return @"vcard";
+}
+
+- (MAPIStoreMessage *) createMessage
+{
+  MAPIStoreMessage *newMessage;
+  SOGoContactGCSEntry *newEntry;
+  NSString *name;
+
+  name = [NSString stringWithFormat: @"%@.vcf",
+                   [SOGoObject globallyUniqueObjectId]];
+  newEntry = [SOGoContactGCSEntry objectWithName: name
+				     inContainer: sogoObject];
+  [newEntry setIsNew: YES];
+  newMessage = [MAPIStoreContactsMessage mapiStoreObjectWithSOGoObject: newEntry
+                                                           inContainer: self];
+
+  return newMessage;
+}
+
+- (NSArray *) rolesForExchangeRights: (uint32_t) rights
+{
+  NSMutableArray *roles;
+
+  roles = [NSMutableArray arrayWithCapacity: 6];
+  if (rights & RightsCreateItems)
+    [roles addObject: SOGoRole_ObjectCreator];
+  if (rights & RightsDeleteAll)
+    [roles addObject: SOGoRole_ObjectEraser];
+  if (rights & RightsEditAll)
+    [roles addObject: SOGoRole_ObjectEditor];
+  if (rights & RightsReadItems)
+    [roles addObject: SOGoRole_ObjectViewer];
+
+  return roles;
+}
+
+- (uint32_t) exchangeRightsForRoles: (NSArray *) roles
+{
+  uint32_t rights = 0;
+
+  if ([roles containsObject: SOGoRole_ObjectCreator])
+    rights |= RightsCreateItems;
+  if ([roles containsObject: SOGoRole_ObjectEraser])
+    rights |= RightsDeleteAll;
+  if ([roles containsObject: SOGoRole_ObjectEditor])
+    rights |= RightsEditAll;
+  if ([roles containsObject: SOGoRole_ObjectViewer])
+    rights |= RightsReadItems;
+  if (rights != 0)
+    rights |= RoleNone; /* actually "folder visible" */
+ 
+  return rights;
+}
+
+- (BOOL) subscriberCanModifyMessages
+{
+  return [[self activeUserRoles] containsObject: SOGoRole_ObjectEditor];
+}
+
+- (BOOL) subscriberCanReadMessages
+{
+  return [[self activeUserRoles] containsObject: SOGoRole_ObjectViewer];
+}
+
+- (int) getPidTagDefaultPostMessageClass: (void **) data
+                                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [@"IPM.Contact" asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
+@end
@@ -0,0 +1,35 @@
+/* MAPIStoreContactsMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTORECONTACTSMESSAGE_H
+#define MAPISTORECONTACTSMESSAGE_H
+
+#import "MAPIStoreGCSMessage.h"
+
+@interface MAPIStoreContactsMessage : MAPIStoreGCSMessage
+{
+  BOOL fetchedAttachments;
+}
+
+@end
+
+#endif /* MAPISTORECONTACTSMESSAGE_H */
@@ -0,0 +1,31 @@
+/* MAPIStoreContactsMessageTable.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTORECONTACTSMESSAGETABLE_H
+#define MAPISTORECONTACTSMESSAGETABLE_H
+
+#import "MAPIStoreGCSMessageTable.h"
+
+@interface MAPIStoreContactsMessageTable : MAPIStoreGCSMessageTable
+@end
+
+#endif /* MAPISTORECONTACTSMESSAGETABLE_H */
@@ -0,0 +1,228 @@
+/* MAPIStoreContactsMessageTable.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+
+#import <EOControl/EOQualifier.h>
+#import <NGMail/NGMailAddress.h>
+#import <NGMail/NGMailAddressParser.h>
+#import <NGCards/NSArray+NGCards.h>
+#import <NGCards/NGVCard.h>
+
+#import <Contacts/SOGoContactGCSEntry.h>
+
+#import "MAPIStoreContactsMessage.h"
+#import "MAPIStoreTypes.h"
+#import "NSDate+MAPIStore.h"
+#import "NSArray+MAPIStore.h"
+#import "NSData+MAPIStore.h"
+#import "NSString+MAPIStore.h"
+
+#import "MAPIStoreContactsMessageTable.h"
+
+#include <mapistore/mapistore_nameid.h>
+
+static Class MAPIStoreContactsMessageK, NGMailAddressK, NSDataK, NSStringK;
+
+@implementation MAPIStoreContactsMessageTable
+
+ (void) initialize
+{
+  MAPIStoreContactsMessageK = [MAPIStoreContactsMessage class];
+  NSDataK = [NSData class];
+  NSStringK = [NSString class];
+  NGMailAddressK = [NGMailAddress class];
+}
+
+ (Class) childObjectClass
+{
+  return MAPIStoreContactsMessageK;
+}
+
+- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
+{
+  static NSMutableDictionary *knownProperties = nil;
+
+  if (!knownProperties)
+    {
+      knownProperties = [NSMutableDictionary new];
+      [knownProperties setObject: @"c_mail"
+			  forKey: MAPIPropertyKey (PidLidEmail1EmailAddress)];
+      [knownProperties setObject: @"c_mail"
+			  forKey: MAPIPropertyKey (PidLidEmail2EmailAddress)];
+      [knownProperties setObject: @"c_mail"
+			  forKey: MAPIPropertyKey (PidLidEmail3EmailAddress)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidLidFileUnder)];
+      [knownProperties setObject: @"c_cn"
+                          forKey: MAPIPropertyKey (PidTagDisplayName)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidTagSubject)]; 
+    }
+
+  return [knownProperties objectForKey: MAPIPropertyKey (property)];
+}
+
+/* restrictions */
+
+- (MAPIRestrictionState) evaluatePropertyRestriction: (struct mapi_SPropertyRestriction *) res
+				       intoQualifier: (EOQualifier **) qualifier
+{
+  MAPIRestrictionState rc;
+  EOAndQualifier *andQualifier;
+  EOKeyValueQualifier *fullNameQualifier, *emailQualifier;
+  NSString *fullName, *email;
+  SEL operator;
+  id value, ngAddress;
+
+  value = NSObjectFromMAPISPropValue (&res->lpProp);
+  switch ((uint32_t) res->ulPropTag)
+    {
+    case PR_MESSAGE_CLASS_UNICODE:
+      if ([value isEqualToString: @"IPM.Contact"])
+	rc = MAPIRestrictionStateAlwaysTrue;
+      else
+	rc = MAPIRestrictionStateAlwaysFalse;
+      break;
+
+    case PR_SENSITIVITY:
+      rc = MAPIRestrictionStateAlwaysTrue;
+      break;
+    case PidLidAddressBookProviderArrayType:
+    case PidLidAddressBookProviderEmailList:
+      /* FIXME: this is a hack. We should return a real qualifier here */
+      rc = MAPIRestrictionStateAlwaysTrue;
+      break;
+
+    case PidLidEmail1OriginalDisplayName:
+    case PidLidEmail2OriginalDisplayName:
+    case PidLidEmail3OriginalDisplayName:
+      rc = MAPIRestrictionStateAlwaysFalse;
+      value = NSObjectFromMAPISPropValue (&res->lpProp);
+      if (value && [value isKindOfClass: NSStringK])
+        {
+          rc = MAPIRestrictionStateNeedsEval;
+          ngAddress = [[NGMailAddressParser mailAddressParserWithString: value]
+                      parse];
+          if ([ngAddress isKindOfClass: NGMailAddressK])
+            {
+              operator = [self operatorFromRestrictionOperator: res->relop];
+              fullName = [ngAddress displayName];
+              email = [ngAddress address];
+              emailQualifier = [[EOKeyValueQualifier alloc]
+                                       initWithKey: @"c_mail"
+                                  operatorSelector: operator
+                                             value: email];
+              if ([fullName length] > 0)
+                {
+                  fullNameQualifier = [[EOKeyValueQualifier alloc]
+                                              initWithKey: @"c_cn"
+                                         operatorSelector: operator
+                                                    value: fullName];
+                  andQualifier = [[EOAndQualifier alloc]
+                                              initWithQualifiers:
+                                     emailQualifier, fullNameQualifier, nil];
+                  [fullNameQualifier release];
+                  [emailQualifier release];
+                  *qualifier = andQualifier;
+                }
+              else
+                *qualifier = emailQualifier;
+              [*qualifier autorelease];
+            }
+        }
+      break;
+    case PidLidEmail1AddressType:
+    case PidLidEmail2AddressType:
+    case PidLidEmail3AddressType:
+      if ([value isEqualToString: @"SMTP"])
+	rc = MAPIRestrictionStateAlwaysTrue;
+      else
+	rc = MAPIRestrictionStateAlwaysFalse;
+      break;
+      
+    default:
+      rc = [super evaluatePropertyRestriction: res intoQualifier: qualifier];
+    }
+
+  return rc;
+}
+
+- (MAPIRestrictionState) evaluateContentRestriction: (struct mapi_SContentRestriction *) res
+				      intoQualifier: (EOQualifier **) qualifier
+{
+  MAPIRestrictionState rc;
+  id value;
+
+  value = NSObjectFromMAPISPropValue (&res->lpProp);
+  if ([value isKindOfClass: NSDataK])
+    {
+      value = [[NSString alloc] initWithData: value
+				    encoding: NSUTF8StringEncoding];
+      [value autorelease];
+    }
+  else if (![value isKindOfClass: NSStringK])
+    [NSException raise: @"MAPIStoreTypeConversionException"
+		format: @"unhandled content restriction for class '%@'",
+		 NSStringFromClass ([value class])];
+
+  switch (res->ulPropTag)
+    {
+    case PR_MESSAGE_CLASS_UNICODE: /* FIXME: should make use of c_component here */
+      if ([value isEqualToString: @"IPM.Contact"])
+	rc = MAPIRestrictionStateAlwaysTrue;
+      else
+	rc = MAPIRestrictionStateAlwaysFalse;
+      break;
+    default:
+      rc = [super evaluateContentRestriction: res intoQualifier: qualifier];
+    }
+
+  return rc;
+}
+
+/* sorting */
+
+- (NSString *) sortIdentifierForProperty: (enum MAPITAGS) property
+{
+  static NSMutableDictionary *knownProperties = nil;
+
+  if (!knownProperties)
+    {
+      knownProperties = [NSMutableDictionary new];
+      [knownProperties setObject: @"c_cn"
+                          forKey: MAPIPropertyKey (PidLidFileUnder)];
+      [knownProperties setObject: @"c_cn"
+                          forKey: MAPIPropertyKey (PidTagDisplayName)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidTagSubject)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidTagNormalizedSubject)];
+    }
+
+  return [knownProperties objectForKey: MAPIPropertyKey (property)];
+}
+
+@end
@@ -0,0 +1,125 @@
+/* MAPIStoreContext.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc. 
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTORECONTEXT_H
+#define MAPISTORECONTEXT_H
+
+#include <talloc.h>
+
+#import <Foundation/NSObject.h>
+
+@class NSArray;
+@class NSFileHandle;
+@class NSMutableArray;
+@class NSMutableDictionary;
+@class NSString;
+@class NSURL;
+
+@class EOQualifier;
+
+@class WOContext;
+
+@class SOGoFolder;
+@class SOGoMAPIFSFolder;
+@class SOGoObject;
+@class SOGoUser;
+
+@class MAPIStoreAuthenticator;
+@class MAPIStoreAttachment;
+@class MAPIStoreAttachmentTable;
+@class MAPIStoreFolder;
+@class MAPIStoreMessage;
+@class MAPIStoreTable;
+@class MAPIStoreUserContext;
+
+@interface MAPIStoreContext : NSObject
+{
+  struct mapistore_connection_info *connInfo;
+  NSMutableArray *containersBag;
+  SOGoUser *activeUser;              /* the user accessing the resource */
+  MAPIStoreUserContext *userContext; /* the owner or the resource */
+  NSURL *contextUrl;
+}
+
+ (struct mapistore_contexts_list *) listAllContextsForUser: (NSString *)  userName
+                                            withIndexing: (struct indexing_context *) indexing
+                                                   inMemCtx: (TALLOC_CTX *) memCtx;
+ (struct mapistore_contexts_list *) listContextsForUser: (NSString *)  userName
+                                         withIndexing: (struct indexing_context *) indexing
+                                                inMemCtx: (TALLOC_CTX *) memCtx;
+ (enum mapistore_error) createRootFolder: (NSString **) mapistoreUriP
+                                  withFID: (uint64_t ) fid
+                                  andName: (NSString *) folderName
+                                  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;
+
+- (id)   initFromURL: (NSURL *) newUri
+  withConnectionInfo: (struct mapistore_connection_info *) newConnInfo
+      andTDBIndexing: (struct indexing_context *) indexing;
+
+- (NSURL *) url;
+- (struct mapistore_connection_info *) connectionInfo;
+
+- (MAPIStoreUserContext *) userContext;
+
+- (SOGoUser *) activeUser;
+
+// - (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;
+
+/* util methods */
+- (NSString *) extractChildNameFromURL: (NSString *) childURL
+			andFolderURLAt: (NSString **) folderURL;
+
+- (uint64_t) idForObjectWithKey: (NSString *) key
+                    inFolderURL: (NSString *) folderURL;
+- (NSArray *) getNewFMIDs: (uint64_t) max;
+- (uint64_t) getNewChangeNumber;
+- (NSArray *) getNewChangeNumbers: (uint64_t) max;
+
+/* subclass methods */
+ (NSString *) MAPIModuleName;
+ (enum mapistore_context_role) MAPIContextRole;
+ (NSString *)
+ createRootSecondaryFolderWithFID: (uint64_t) fid
+                          andName: (NSString *) folderName
+                          forUser: (NSString *) userName;
+- (Class) MAPIStoreFolderClass;
+
+/* the top-most parent of the context folder: SOGoMailAccount,
+   SOGoCalendarFolders, ... */
+- (id) rootSOGoFolder;
+
+@end
+
+#endif /* MAPISTORECONTEXT_H */
@@ -0,0 +1,651 @@
+/* MAPIStoreContext.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSURL.h>
+
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSObject+Values.h>
+
+#import <SOGo/SOGoFolder.h>
+#import <SOGo/SOGoUser.h>
+
+#import "MAPIStoreAttachment.h"
+// #import "MAPIStoreAttachmentTable.h"
+#import "MAPIStoreFallbackContext.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreFolderTable.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreMessage.h"
+#import "MAPIStoreMessageTable.h"
+#import "MAPIStoreFAIMessage.h"
+#import "MAPIStoreFAIMessageTable.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
+#import "NSArray+MAPIStore.h"
+#import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"
+
+#import "MAPIStoreContext.h"
+
+#undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <util/attr.h>
+#include <libmapiproxy.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
+#include <talloc.h>
+
+/* TODO: homogenize method names and order of parameters */
+
+@implementation MAPIStoreContext : NSObject
+
+/* sogo://username:password@{contacts,calendar,tasks,journal,notes,mail}/dossier/id */
+
+static Class NSExceptionK, MAPIStoreFallbackContextK, SOGoObjectK;
+
+static NSMutableDictionary *contextClassMapping;
+
+ (void) initialize
+{
+  NSArray *classes;
+  Class currentClass;
+  NSUInteger count, max;
+  NSString *moduleName;
+
+  NSExceptionK = [NSException class];
+  SOGoObjectK = [SOGoObject class];
+
+  contextClassMapping = [NSMutableDictionary new];
+  classes = GSObjCAllSubclassesOfClass (self);
+  max = [classes count];
+  for (count = 0; count < max; count++)
+    {
+      currentClass = [classes objectAtIndex: count];
+      moduleName = [currentClass MAPIModuleName];
+      if (moduleName)
+	{
+	  [contextClassMapping setObject: currentClass
+                                  forKey: 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
+                                                   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]];
+
+  classes = GSObjCAllSubclassesOfClass (self);
+  max = [classes count];
+  for (count = 0; count < max; count++)
+    {
+      currentClass = [classes objectAtIndex: count];
+      current = [currentClass listContextsForUser: userName
+                                  withIndexing: indexing
+                                         inMemCtx: memCtx];
+      if (current)
+        DLIST_CONCATENATE(list, current, void);
+    }
+
+  return list;
+}
+
+ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName
+                                         withIndexing: (struct indexing_context *) indexing
+                                                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return NULL;
+}
+
+static Class
+MAPIStoreLookupContextClassByRole (Class self, enum mapistore_context_role role)
+{
+  static NSMutableDictionary *classMapping = nil;
+  Class currentClass;
+  enum mapistore_context_role classRole;
+  NSNumber *roleNbr;
+  NSArray *classes;
+  NSUInteger count, max;
+
+  if (!classMapping)
+    {
+      classMapping = [NSMutableDictionary new];
+      classes = GSObjCAllSubclassesOfClass (self);
+      max = [classes count];
+      for (count = 0; count < max; count++)
+        {
+          currentClass = [classes objectAtIndex: count];
+          classRole = [currentClass MAPIContextRole];
+          if (classRole != -1)
+            {
+              roleNbr = [NSNumber numberWithUnsignedInt: classRole];
+              [classMapping setObject: currentClass
+                               forKey: roleNbr];
+            }
+        }
+    }
+
+  roleNbr = [NSNumber numberWithUnsignedInt: role];
+
+  return [classMapping objectForKey: roleNbr];
+}
+
+ (enum mapistore_error) createRootFolder: (NSString **) mapistoreUriP
+                                  withFID: (uint64_t) fid
+                                  andName: (NSString *) folderName
+                                  forUser: (NSString *) userName
+                                 withRole: (enum mapistore_context_role) role
+{
+  Class contextClass;
+  NSString *mapistoreURI;
+  enum mapistore_error rc = MAPISTORE_SUCCESS;
+
+  contextClass = MAPIStoreLookupContextClassByRole (self, role);
+  if (!contextClass)
+    contextClass = MAPIStoreFallbackContextK;
+
+  mapistoreURI = [contextClass createRootSecondaryFolderWithFID: fid
+                                                        andName: folderName
+                                                        forUser: userName];
+  if (!mapistoreURI && contextClass != MAPIStoreFallbackContextK)
+    mapistoreURI = [MAPIStoreFallbackContextK createRootSecondaryFolderWithFID: fid
+                                                                       andName: folderName
+                                                                       forUser: userName];
+  if (mapistoreURI)
+    *mapistoreUriP = mapistoreURI;
+  else
+    rc = MAPISTORE_ERR_NOT_FOUND;
+
+  return rc;
+}
+
+static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
+{
+  NSString *urlString;
+  NSURL *completeURL;
+
+  urlString = [NSString stringWithFormat: @"sogo://%@",
+                        [NSString stringWithUTF8String: uri]];
+  if (![urlString hasSuffix: @"/"])
+    urlString = [urlString stringByAppendingString: @"/"];
+  completeURL = [NSURL URLWithString: urlString];
+
+  return completeURL;
+}
+
+ (int) 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);
+
+  context = nil;
+
+  baseURL = CompleteURLFromMapistoreURI (newUri);
+  if (baseURL)
+    {
+      module = [baseURL host];
+      if (module)
+        {
+          contextClass = [contextClassMapping objectForKey: module];
+          if (contextClass)
+            {
+              context = [[contextClass alloc] initFromURL: baseURL
+                                       withConnectionInfo: newConnInfo
+                                           andTDBIndexing: indexing];
+              if (context)
+                {
+                  [context autorelease];
+                  rc = MAPISTORE_SUCCESS;
+                  *contextPtr = context;
+                }
+            }
+          else
+            NSLog (@"ERROR: unrecognized module name '%@'", module);
+        }
+    }
+  else
+    NSLog (@"ERROR: url could not be parsed");
+
+  return rc;
+}
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      activeUser = nil;
+      userContext = nil;
+      contextUrl = nil;
+      containersBag = [NSMutableArray new];
+    }
+
+  return self;
+}
+
+- (id)   initFromURL: (NSURL *) newUrl
+  withConnectionInfo: (struct mapistore_connection_info *) newConnInfo
+      andTDBIndexing: (struct indexing_context *) indexing
+{
+  NSString *username;
+
+  if ((self = [self init]))
+    {
+      ASSIGN (contextUrl, newUrl);
+
+      username = [newUrl user];
+      if ([username length] == 0)
+        {
+          [self errorWithFormat:
+                  @"attempt to instantiate a context with an empty owner"];
+          [self release];
+          return nil;
+        }
+
+      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]);
+      if (!activeUser)
+        {
+          [self errorWithFormat: @"user '%@' not found in SOGo environment",
+                username];
+          [self release];
+          return nil;
+        }
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+#if 0
+  mapistore_mgmt_backend_unregister_user ([self connectionInfo], "SOGo", 
+                                          [[userContext username]
+                                            UTF8String]);
+#endif
+
+  [contextUrl release];
+  [userContext release];
+  [containersBag release];
+
+  [super dealloc];
+}
+
+- (MAPIStoreUserContext *) userContext
+{
+  return userContext;
+}
+
+- (NSURL *) url
+{
+  return contextUrl;
+}
+
+- (struct mapistore_connection_info *) connectionInfo
+{
+  return connInfo;
+}
+
+- (SOGoUser *) activeUser
+{
+  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
+{
+  int rc;
+  NSString *objectURL, *url;
+  // TDB_DATA key, dbuf;
+
+  url = [[contextUrl absoluteString]
+            stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+  objectURL = [[userContext mapping] urlFromID: fmid];
+  if (objectURL)
+    {
+      if ([objectURL hasPrefix: url])
+        {
+          *path = [[objectURL substringFromIndex: 7] asUnicodeInMemCtx: memCtx];
+          [self logWithFormat: @"found path '%s' for fmid 0x%.16"PRIx64"", *path, fmid];
+          rc = MAPISTORE_SUCCESS;
+        }
+      else
+        {
+          [self logWithFormat: @"context (%@, %@) does not contain "
+                               @"found fmid: 0x%.16"PRIx64"", objectURL, url, fmid];
+          *path = NULL;
+          rc = MAPISTORE_SUCCESS;
+        }
+    }
+  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;
+    }
+
+  return rc;
+}
+
+- (void) ensureContextFolder
+{
+}
+
+- (int) getRootFolder: (MAPIStoreFolder **) folderPtr
+              withFID: (uint64_t) newFid
+{
+  enum mapistore_error rc;
+  MAPIStoreMapping *mapping;
+  MAPIStoreFolder *baseFolder;
+  SOGoFolder *currentFolder;
+  WOContext *woContext;
+  NSString *path;
+  NSArray *pathComponents;
+  NSUInteger count, max;
+
+  mapping = [userContext mapping];
+  if (![mapping urlFromID: newFid])
+    [mapping registerURL: [contextUrl absoluteString]
+                  withID: newFid];
+  [userContext activateWithUser: activeUser];
+  woContext = [userContext woContext];
+
+  [self ensureContextFolder];
+  currentFolder = [self rootSOGoFolder];
+  [containersBag addObject: currentFolder];
+
+  /* HACK:
+     -[NSURL path] returns unescaped strings in theory. In pratice, sometimes
+     it does, sometimes not. Therefore we use the result of our own
+     implementation of -[NSString
+     stringByReplacingPercentEscapeUsingEncoding:], which returns nil if the
+     original string contains non-ascii chars, from which we can determine
+     whether the path was unescaped or not. */
+  path = [[contextUrl path]
+           stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+  if (!path)
+    path = [contextUrl path];
+
+  if ([path hasPrefix: @"/"])
+    path = [path substringFromIndex: 1];
+  if ([path hasSuffix: @"/"])
+    path = [path substringToIndex: [path length] - 1];
+  if ([path length] > 0)
+    {
+      pathComponents = [path componentsSeparatedByString: @"/"];
+      max = [pathComponents count];
+      for (count = 0; currentFolder && count < max; count++)
+        {
+          [woContext setClientObject: currentFolder];
+          currentFolder = [currentFolder
+                            lookupName: [pathComponents objectAtIndex: count]
+                            inContext: woContext
+                            acquire: NO];
+          if ([currentFolder isKindOfClass: SOGoObjectK]) /* class common to all
+                                                             SOGo folder types */
+            [containersBag addObject: currentFolder];
+          else
+            currentFolder = nil;
+        }
+    }
+
+  if (currentFolder)
+    {
+      baseFolder = [[self MAPIStoreFolderClass]
+                     mapiStoreObjectWithSOGoObject: currentFolder
+                                       inContainer: nil];
+      [baseFolder setContext: self];
+      *folderPtr = baseFolder;
+      rc = MAPISTORE_SUCCESS;
+    }
+  else if ([[userContext sogoUser] isEqual: activeUser])
+    rc = MAPISTORE_ERR_NOT_FOUND;
+  else
+    rc = MAPISTORE_ERR_DENIED;
+
+  return rc;
+}
+
+/* utils */
+
+- (NSString *) extractChildNameFromURL: (NSString *) objectURL
+			andFolderURLAt: (NSString **) folderURL;
+{
+  NSString *childKey;
+  NSRange lastSlash;
+  NSUInteger slashPtr;
+
+  if ([objectURL hasSuffix: @"/"])
+    objectURL = [objectURL substringToIndex: [objectURL length] - 2];
+  lastSlash = [objectURL rangeOfString: @"/"
+			       options: NSBackwardsSearch];
+  if (lastSlash.location != NSNotFound)
+    {
+      slashPtr = NSMaxRange (lastSlash);
+      childKey = [objectURL substringFromIndex: slashPtr];
+      if ([childKey length] == 0)
+	childKey = nil;
+      if (folderURL)
+	*folderURL = [objectURL substringToIndex: slashPtr];
+    }
+  else
+    childKey = nil;
+
+  return childKey;
+}
+
+- (uint64_t) idForObjectWithKey: (NSString *) key
+                    inFolderURL: (NSString *) folderURL
+{
+  NSString *childURL, *owner;
+  MAPIStoreMapping *mapping;
+  uint64_t mappingId;
+  uint32_t contextId;
+  void *rootObject;
+
+  if (key)
+    childURL = [NSString stringWithFormat: @"%@%@", folderURL,
+                  [key stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+  else
+    childURL = folderURL;
+  mapping = [userContext mapping];
+  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;
+
+      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);
+    }
+
+  return mappingId;
+}
+
+- (uint64_t) getNewChangeNumber
+{
+  uint64_t newVersionNumber;
+
+  if (openchangedb_get_new_changeNumber (connInfo->oc_ctx, &newVersionNumber)
+      != MAPI_E_SUCCESS)
+    abort ();
+
+  return newVersionNumber;
+}
+
+- (NSArray *) getNewChangeNumbers: (uint64_t) max
+{
+  TALLOC_CTX *memCtx;
+  NSMutableArray *newChangeNumbers;
+  uint64_t count;
+  struct UI8Array_r *numbers;
+  NSString *newNumber;
+
+  memCtx = talloc_zero(NULL, TALLOC_CTX);
+  newChangeNumbers = [NSMutableArray arrayWithCapacity: max];
+  
+  if (openchangedb_get_new_changeNumbers (connInfo->oc_ctx,
+                                          memCtx, max, &numbers)
+      != MAPI_E_SUCCESS || numbers->cValues != max)
+    abort ();
+  for (count = 0; count < max; count++)
+    {
+      newNumber
+        = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
+      [newChangeNumbers addObject: newNumber];
+    }
+
+  talloc_free (memCtx);
+
+  return newChangeNumbers;
+}
+
+- (NSArray *) getNewFMIDs: (uint64_t) max
+{
+  TALLOC_CTX *memCtx;
+  NSMutableArray *newFMIDs;
+  uint64_t count;
+  struct UI8Array_r *numbers;
+  NSString *newNumber;
+
+  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 ();
+  for (count = 0; count < max; count++)
+    {
+      newNumber
+        = [NSString stringWithUnsignedLongLong: numbers->lpui8[count]];
+      [newFMIDs addObject: newNumber];
+    }
+
+  talloc_free (memCtx);
+
+  return newFMIDs;
+}
+
+/* subclasses */
+
+ (NSString *) MAPIModuleName
+{
+  [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
+ (enum mapistore_context_role) MAPIContextRole
+{
+  return -1;
+}
+
+ (NSString *)
+ createRootSecondaryFolderWithFID: (uint64_t) fid
+                          andName: (NSString *) folderName
+                          forUser: (NSString *) userName
+{
+  [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
+- (Class) MAPIStoreFolderClass
+{
+  [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
+- (id) rootSOGoFolder
+{
+  [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
+@end
@@ -0,0 +1,32 @@
+/* MAPIStoreDBBaseContext.h - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTOREDBBASECONTEXT_H
+#define MAPISTOREDBBASECONTEXT_H
+
+#import "MAPIStoreContext.h"
+
+@interface MAPIStoreDBBaseContext : MAPIStoreContext
+
+@end
+
+#endif /* MAPISTOREDBBASECONTEXT_H */
@@ -0,0 +1,114 @@
+/* MAPIStoreDBBaseContext.m - this file is part of SOGo
+ *
+ * Copyright (C) 2012-2014 Inverse inc.
+ *
+ * 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.
+ */
+
+/* A generic parent class for all context that will store their data on the
+   disk in the form of a plist. */
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
+
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "MAPIStoreDBFolder.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreUserContext.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
+
+#import "MAPIStoreDBBaseContext.h"
+
+#undef DEBUG
+#include <mapistore/mapistore.h>
+
+static Class MAPIStoreDBFolderK;
+
+@implementation MAPIStoreDBBaseContext
+
+ (void) initialize
+{
+  MAPIStoreDBFolderK = [MAPIStoreDBFolder class];
+}
+
+ (NSString *) MAPIModuleName
+{
+  return nil;
+}
+
+- (Class) MAPIStoreFolderClass
+{
+  return MAPIStoreDBFolderK;
+}
+
+- (void) ensureContextFolder
+{
+  SOGoCacheGCSFolder *currentFolder;
+  NSArray *parts;
+  NSMutableArray *folders;
+  NSString *folderName;
+  NSUInteger count, max;
+
+  parts = [[contextUrl path] componentsSeparatedByString: @"/"];
+  max = [parts count];
+  folders = [NSMutableArray arrayWithCapacity: max];
+
+  /* build the folder chain */
+  currentFolder = [self rootSOGoFolder];
+  [folders addObject: currentFolder];
+  for (count = 1; count < max; count++)
+    {
+      folderName = [parts objectAtIndex: count];
+      if ([folderName length] > 0)
+        {
+          currentFolder = [SOGoCacheGCSFolder objectWithName: folderName
+                                               inContainer: currentFolder];
+          [folders addObject: currentFolder];
+        }
+    }
+
+  /* ensure each folder in the chain actually exists, so that it becomes
+     "listable" in further operations */
+  max = [folders count];
+  for (count = 0; count < max; count++)
+    {
+      currentFolder = [folders objectAtIndex: count];
+      [currentFolder reloadIfNeeded];
+      if ([currentFolder isNew])
+        [currentFolder save];
+    }
+}
+
+- (id) rootSOGoFolder
+{
+  SOGoCacheGCSFolder *folder;
+
+  [userContext ensureFolderTableExists];
+
+  folder = [SOGoCacheGCSFolder objectWithName: [isa MAPIModuleName]
+                                inContainer: nil];
+  [folder setTableUrl: [userContext folderTableURL]];
+  // [folder reloadIfNeeded];
+
+  /* we don't need to set the "path prefix" of the folder since the module
+     name is used as the label for the top folder */
+
+  return folder;
+}
+
+@end
@@ -0,0 +1,33 @@
+/* MAPIStoreDBFolder.h - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREDBFOLDER_H
+#define MAPISTOREDBFOLDER_H
+
+#import "MAPIStoreFolder.h"
+
+@interface MAPIStoreDBFolder : MAPIStoreFolder
+
+@end
+
+
+#endif /* MAPISTOREDBFOLDER_H */
@@ -0,0 +1,372 @@
+/* MAPIStoreDBFolder.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#include <inttypes.h>
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoFolder.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/EOQualifier+SOGoCacheObject.h>
+#import "MAPIStoreContext.h"
+#import "MAPIStoreDBFolderTable.h"
+#import "MAPIStoreDBMessage.h"
+#import "MAPIStoreDBMessageTable.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
+#import "SOGoMAPIDBMessage.h"
+
+#import "MAPIStoreDBFolder.h"
+
+#undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+
+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
+{
+  EOKeyValueQualifierK = [EOKeyValueQualifier class];
+  SOGoCacheGCSFolderK = [SOGoCacheGCSFolder class];
+  MAPIStoreDBFolderK = [MAPIStoreDBFolder class];
+}
+
+- (void) setupAuxiliaryObjects
+{
+  [super setupAuxiliaryObjects];
+  ASSIGN (sogoObject, dbFolder);
+}
+
+- (MAPIStoreMessageTable *) messageTable
+{
+  return [MAPIStoreDBMessageTable tableForContainer: self];
+}
+
+- (MAPIStoreFolderTable *) folderTable
+{
+  return [MAPIStoreDBFolderTable tableForContainer: self];
+}
+
+- (enum mapistore_error) createFolder: (struct SRow *) aRow
+                              withFID: (uint64_t) newFID
+                               andKey: (NSString **) newKeyP
+{
+  enum mapistore_error rc;
+  NSString *folderName, *nameInContainer;
+  SOGoCacheGCSFolder *newFolder;
+  struct SPropValue *value;
+
+  value = get_SPropValue_SRow (aRow, PidTagDisplayName);
+  if (value)
+    folderName = [NSString stringWithUTF8String: value->value.lpszW];
+  else
+    {
+      value = get_SPropValue_SRow (aRow, PidTagDisplayName_string8);
+      if (value)
+        folderName = [NSString stringWithUTF8String: value->value.lpszA];
+      else
+        folderName = nil;
+    }
+
+  if (folderName)
+    {
+      nameInContainer = [NSString stringWithFormat: @"0x%.16"PRIx64,
+                                  (unsigned long long) newFID];
+      newFolder = [SOGoCacheGCSFolderK objectWithName: nameInContainer
+                                        inContainer: sogoObject];
+      [newFolder reloadIfNeeded];
+      [[newFolder properties] setObject: folderName
+                                 forKey: MAPIPropertyKey (PidTagDisplayName)];
+      [newFolder save];
+      *newKeyP = nameInContainer;
+      rc = MAPISTORE_SUCCESS;
+    }
+  else
+    rc = MAPISTORE_ERR_INVALID_PARAMETER;
+
+  return rc;
+}
+
+- (enum mapistore_error) moveCopyToFolder: (MAPIStoreFolder *) targetFolder
+                              withNewName: (NSString *) newFolderName
+                                   isMove: (BOOL) isMove
+                              isRecursive: (BOOL) isRecursive
+                                 inMemCtx: (TALLOC_CTX *) memCtx
+{
+  enum mapistore_error rc;
+  NSString *path, *pathComponent, *targetPath, *newPath;
+  NSString *newURL;
+  MAPIStoreMapping *mapping;
+  NSRange slashRange;
+
+  if (isMove && [targetFolder isKindOfClass: MAPIStoreDBFolderK])
+    {
+      path = [sogoObject path];
+      slashRange = [path rangeOfString: @"/" options: NSBackwardsSearch];
+      if (slashRange.location == NSNotFound)
+        [NSException raise: @"MAPIStoreIOException"
+                    format: @"db folder path must start with a '/'"];
+      else
+        pathComponent = [path substringFromIndex: slashRange.location + 1];
+      targetPath = [[targetFolder sogoObject] path];
+      newPath = [NSString stringWithFormat: @"%@/%@",
+                          targetPath, pathComponent];
+      [dbFolder changePathTo: newPath];
+      
+      mapping = [self mapping];
+      newURL = [NSString stringWithFormat: @"%@%@/",
+                         [targetFolder url], pathComponent];
+      [mapping updateID: [self objectId]
+                withURL: newURL];
+
+      [targetFolder cleanupCaches];
+
+      rc = MAPISTORE_SUCCESS;
+    }
+  else
+    rc = [super moveCopyToFolder: targetFolder withNewName: newFolderName
+                          isMove: isMove
+                     isRecursive: isRecursive
+                        inMemCtx: memCtx];
+
+  return rc;
+}
+
+- (MAPIStoreMessage *) createMessage
+{
+  MAPIStoreMessage *newMessage;
+  SOGoMAPIDBMessage *fsObject;
+  NSString *newKey;
+
+  newKey = [NSString stringWithFormat: @"%@.plist",
+                     [SOGoObject globallyUniqueObjectId]];
+  fsObject = [SOGoMAPIDBMessage objectWithName: newKey
+                                   inContainer: sogoObject];
+  [fsObject setObjectType: MAPIMessageCacheObject];
+  [fsObject reloadIfNeeded];
+  newMessage = [MAPIStoreDBMessage mapiStoreObjectWithSOGoObject: fsObject
+                                                     inContainer: self];
+
+  return newMessage;
+}
+
+- (NSArray *) messageKeysMatchingQualifier: (EOQualifier *) qualifier
+                          andSortOrderings: (NSArray *) sortOrderings
+{
+  NSArray *keys;
+  SOGoUser *ownerUser;
+
+  ownerUser = [[self userContext] sogoUser];
+  if ([[context activeUser] isEqual: ownerUser]
+      || [self subscriberCanReadMessages])
+    keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
+                                             includeDeleted: NO
+                                          matchingQualifier: qualifier
+                                           andSortOrderings: sortOrderings];
+  else
+    keys = [NSArray array];
+
+  return keys;
+}
+
+- (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
+                         andSortOrderings: (NSArray *) sortOrderings
+{
+  return [dbFolder childKeysOfType: MAPIFolderCacheObject
+                    includeDeleted: NO
+                 matchingQualifier: qualifier
+                  andSortOrderings: sortOrderings];
+}
+
+/* TODO: now that we are DB-based, this method can easily be implemented
+
+- (NSArray *) getDeletedKeysFromChangeNumber: (uint64_t) changeNum
+                                       andCN: (NSNumber **) cnNbrs
+                                 inTableType: (enum mapistore_table_type) tableType
+{
+}
+*/
+
+- (NSDate *) lastMessageModificationTime
+{
+  NSUInteger count, max;
+  NSDate *date, *fileDate;
+  MAPIStoreDBMessage *msg;
+  NSArray *messageKeys;
+
+  messageKeys = [self messageKeys];
+
+  date = [NSCalendarDate date];
+  //[self logWithFormat: @"current date: %@", date];
+
+  max = [messageKeys count];
+  for (count = 0; count < max; count++)
+    {
+      msg = [self lookupMessage: [messageKeys objectAtIndex: count]];
+      fileDate = [msg lastModificationTime];
+      if ([date laterDate: fileDate] == fileDate)
+        {
+          //[self logWithFormat: @"current date: %@", date];
+          
+          date = fileDate;
+        }
+    }
+
+  return date;
+}
+
+- (SOGoFolder *) aclFolder
+{
+  return sogoObject;
+}
+
+- (NSArray *) rolesForExchangeRights: (uint32_t) rights
+{
+  NSMutableArray *roles;
+
+  roles = [NSMutableArray arrayWithCapacity: 9];
+  if (rights & RightsReadItems)
+    [roles addObject: MAPIStoreRightReadItems];
+  if (rights & RightsCreateItems)
+    [roles addObject: MAPIStoreRightCreateItems];
+  if (rights & RightsEditOwn)
+    [roles addObject: MAPIStoreRightEditOwn];
+  if (rights & RightsDeleteOwn)
+    [roles addObject: MAPIStoreRightDeleteOwn];
+  if (rights & RightsEditAll)
+    [roles addObject: MAPIStoreRightEditAll];
+  if (rights & RightsDeleteAll)
+    [roles addObject: MAPIStoreRightDeleteAll];
+  if (rights & RightsCreateSubfolders)
+    [roles addObject: MAPIStoreRightCreateSubfolders];
+  if (rights & RightsFolderOwner)
+    [roles addObject: MAPIStoreRightFolderOwner];
+  if (rights & RightsFolderContact)
+    [roles addObject: MAPIStoreRightFolderContact];
+
+  return roles;
+}
+
+- (uint32_t) exchangeRightsForRoles: (NSArray *) roles
+{
+  uint32_t rights = 0;
+
+  if ([roles containsObject: MAPIStoreRightReadItems])
+    rights |= RightsReadItems;
+  if ([roles containsObject: MAPIStoreRightCreateItems])
+    rights |= RightsCreateItems;
+  if ([roles containsObject: MAPIStoreRightEditOwn])
+    rights |= RightsEditOwn;
+  if ([roles containsObject: MAPIStoreRightDeleteOwn])
+    rights |= RightsDeleteOwn;
+  if ([roles containsObject: MAPIStoreRightEditAll])
+    rights |= RightsEditAll;
+  if ([roles containsObject: MAPIStoreRightDeleteAll])
+    rights |= RightsDeleteAll;
+  if ([roles containsObject: MAPIStoreRightCreateSubfolders])
+    rights |= RightsCreateSubfolders;
+  if ([roles containsObject: MAPIStoreRightFolderOwner])
+    rights |= RightsFolderOwner;
+  if ([roles containsObject: MAPIStoreRightFolderContact])
+    rights |= RightsFolderContact;
+  if (rights != 0)
+    rights |= RoleNone; /* actually "folder visible" */
+ 
+  return rights;
+}
+
+- (BOOL) _testRoleForActiveUser: (const NSString *) role
+{
+  SOGoUser *activeUser;
+  NSArray *roles;
+
+  activeUser = [[self context] activeUser];
+
+  roles = [[self aclFolder] aclsForUser: [activeUser login]];
+
+  return [roles containsObject: role];
+}
+
+- (BOOL) subscriberCanCreateMessages
+{
+  return [self _testRoleForActiveUser: MAPIStoreRightCreateItems];
+}
+
+- (BOOL) subscriberCanModifyMessages
+{
+  return ([self _testRoleForActiveUser: MAPIStoreRightEditAll]
+          || [self _testRoleForActiveUser: MAPIStoreRightEditOwn]);
+}
+
+- (BOOL) subscriberCanReadMessages
+{
+  NSString *displayName;
+
+  /* when this folder is the "Freebusy Data" folder, we need to allow
+     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)];
+
+  return ([displayName isEqualToString: @"Freebusy Data"]
+          || [self _testRoleForActiveUser: MAPIStoreRightReadItems]);
+}
+
+- (BOOL) subscriberCanDeleteMessages
+{
+  return ([self _testRoleForActiveUser: MAPIStoreRightDeleteAll]
+          || [self _testRoleForActiveUser: MAPIStoreRightDeleteOwn]);
+}
+
+- (BOOL) subscriberCanCreateSubFolders
+{
+  return [self _testRoleForActiveUser: MAPIStoreRightCreateSubfolders];
+}
+
+- (BOOL) supportsSubFolders
+{
+  return YES;
+}
+
+@end
@@ -0,0 +1,31 @@
+/* MAPIStoreDBFolderTable.h - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTOREDBFOLDERTABLE_H
+#define MAPISTOREDBFOLDERTABLE_H
+
+#import "MAPIStoreFolderTable.h"
+
+@interface MAPIStoreDBFolderTable : MAPIStoreFolderTable
+@end
+
+#endif /* MAPISTOREDBFOLDERTABLE_H */
@@ -0,0 +1,36 @@
+/* MAPIStoreDBFolderTable.m - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSString.h>
+
+#import "MAPIStoreTypes.h"
+
+#import "MAPIStoreDBFolderTable.h"
+
+@implementation MAPIStoreDBFolderTable
+
+- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
+{
+  return [NSString stringWithFormat: @"%@", MAPIPropertyKey (property)];
+}
+
+@end
@@ -0,0 +1,31 @@
+/* MAPIStoreDBMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREDBMESSAGE_H
+#define MAPISTOREDBMESSAGE_H
+
+#import "MAPIStoreMessage.h"
+
+@interface MAPIStoreDBMessage : MAPIStoreMessage
+@end
+
+#endif /* MAPISTOREDBMESSAGE_H */
@@ -0,0 +1,209 @@
+/* MAPIStoreDBMessage.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "MAPIStoreContext.h"
+#import "MAPIStorePropertySelectors.h"
+#import "SOGoMAPIDBMessage.h"
+
+#import "MAPIStoreDBFolder.h"
+#import "MAPIStoreDBMessage.h"
+#import "MAPIStoreTypes.h"
+#import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"
+
+#undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+
+@implementation MAPIStoreDBMessage
+
+ (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                      inMemCtx: (TALLOC_CTX *) memCtx
+{
+  struct SPropTagArray *properties;
+  NSUInteger count;
+  enum MAPITAGS faiProperties[] = { 0x68350102, 0x683c0102, 0x683e0102,
+                                    0x683f0102, 0x68410003, 0x68420102,
+                                    0x68450102, 0x68460003 };
+
+  properties = talloc_zero (memCtx, struct SPropTagArray);
+  properties->cValues = MAPIStoreSupportedPropertiesCount + 8;
+  properties->aulPropTag = talloc_array (properties, enum MAPITAGS,
+                                         MAPIStoreSupportedPropertiesCount + 8);
+
+  for (count = 0; count < MAPIStoreSupportedPropertiesCount; count++)
+    properties->aulPropTag[count] = MAPIStoreSupportedProperties[count];
+
+  /* FIXME (hack): append a few undocumented properties that can be added to
+     FAI messages */
+  for (count = 0; count < 8; count++)
+    properties->aulPropTag[MAPIStoreSupportedPropertiesCount+count]
+      = faiProperties[count];
+
+  *propertiesP = properties;
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (id) initWithSOGoObject: (id) newSOGoObject
+              inContainer: (MAPIStoreObject *) newContainer
+{
+  if ((self = [super initWithSOGoObject: newSOGoObject
+                            inContainer: newContainer]))
+    {
+      [properties release];
+      properties = [newSOGoObject properties];
+      [properties retain];
+    }
+
+  return self;
+}
+
+- (uint64_t) objectVersion
+{
+  NSNumber *versionNbr;
+  uint64_t objectVersion;
+
+  [(SOGoMAPIDBMessage *) sogoObject reloadIfNeeded];
+  versionNbr = [properties objectForKey: @"version"];
+  if (versionNbr)
+    objectVersion = (([versionNbr unsignedLongLongValue] >> 16)
+                     & 0x0000ffffffffffffLL);
+  else
+    objectVersion = ULLONG_MAX;
+
+  return objectVersion;
+}
+
+//
+// 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
+{
+  *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];
+
+  [self logWithFormat: @"METHOD '%s' - unable to determine message class. Falling back to IPM.Note", __FUNCTION__];
+
+  return MAPISTORE_SUCCESS;
+}
+
+- (int) getProperties: (struct mapistore_property_data *) data
+             withTags: (enum MAPITAGS *) tags
+             andCount: (uint16_t) columnCount
+             inMemCtx: (TALLOC_CTX *) memCtx
+{
+  [sogoObject reloadIfNeeded];
+
+  return [super getProperties: data
+                     withTags: tags
+                     andCount: columnCount
+                     inMemCtx: memCtx];
+}
+
+- (int) getProperty: (void **) data
+            withTag: (enum MAPITAGS) propTag
+           inMemCtx: (TALLOC_CTX *) memCtx
+{
+  id value;
+  int rc;
+ 
+  value = [properties objectForKey: MAPIPropertyKey (propTag)];
+  if (value)
+    rc = [value getValue: data forTag: propTag inMemCtx: memCtx];
+  else
+    rc = [super getProperty: data withTag: propTag inMemCtx: memCtx];
+
+  return rc;
+}
+
+- (void) addProperties: (NSDictionary *) newNewProperties
+{
+  [sogoObject reloadIfNeeded];
+
+  [super addProperties: newNewProperties];
+}
+
+- (void) save: (TALLOC_CTX *) memCtx
+{
+  uint64_t newVersion;
+
+  if ([attachmentKeys count] > 0)
+    [properties setObject: attachmentParts forKey: @"attachments"];
+
+  newVersion = [[self context] getNewChangeNumber];
+  [properties setObject: [NSNumber numberWithUnsignedLongLong: newVersion]
+                 forKey: @"version"];
+
+  [self logWithFormat: @"%d props in dict", [properties count]];
+
+  [sogoObject save];
+}
+
+- (BOOL) _messageIsFreeBusy
+{
+  NSString *msgClass;
+  
+  /* This is a HACK until we figure out how to determine a message position in
+     the mailbox hierarchy.... (missing: folderid and role) */
+  msgClass = [properties
+               objectForKey: MAPIPropertyKey (PR_MESSAGE_CLASS_UNICODE)];
+
+  return [msgClass isEqualToString: @"IPM.Microsoft.ScheduleData.FreeBusy"];
+}
+
+/* TODO: differentiate between the "Own" and "All" cases */
+- (BOOL) subscriberCanReadMessage
+{
+  return [(MAPIStoreFolder *) container subscriberCanReadMessages];
+          // || [self _messageIsFreeBusy]);
+}
+
+- (BOOL) subscriberCanModifyMessage
+{
+  return ((isNew
+           && [(MAPIStoreFolder *) container subscriberCanCreateMessages])
+          || (!isNew
+              && [(MAPIStoreFolder *) container subscriberCanModifyMessages]));
+          // || [self _messageIsFreeBusy]);
+}
+
+- (NSDate *) creationTime
+{
+  return [sogoObject creationDate];
+}
+
+- (NSDate *) lastModificationTime
+{
+  return [sogoObject lastModified];
+}
+
+@end
@@ -0,0 +1,31 @@
+/* MAPIStoreDBMessageTable.h - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREDBMESSAGETABLE_H
+#define MAPISTOREDBMESSAGETABLE_H
+
+#import "MAPIStoreMessageTable.h"
+
+@interface MAPIStoreDBMessageTable : MAPIStoreMessageTable
+@end
+
+#endif /* MAPISTOREDBMESSAGETABLE_H */
@@ -0,0 +1,132 @@
+/* MAPIStoreDBMessageTable.m - this file is part of SOGo
+ *
+ * Copyright (C) 2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSString.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
+
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreDBMessage.h"
+
+#import "MAPIStoreDBMessageTable.h"
+
+#undef DEBUG
+#include <mapistore/mapistore.h>
+
+static Class MAPIStoreDBMessageK = Nil;
+
+@implementation MAPIStoreDBMessageTable
+
+ (void) initialize
+{
+  MAPIStoreDBMessageK = [MAPIStoreDBMessage class];
+}
+
+ (Class) childObjectClass
+{
+  return MAPIStoreDBMessageK;
+}
+
+- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
+{
+  return [NSString stringWithFormat: @"%@", MAPIPropertyKey (property)];
+}
+
+- (MAPIRestrictionState) evaluatePropertyRestriction: (struct mapi_SPropertyRestriction *) res
+				       intoQualifier: (EOQualifier **) qualifier
+{
+  MAPIRestrictionState rc;
+  id value;
+  NSNumber *version;
+  uint64_t cVersion;
+
+  if ((uint32_t) res->ulPropTag == PidTagChangeNumber)
+    {
+      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
+                                                      value: version];
+      [*qualifier autorelease];
+      rc = MAPIRestrictionStateNeedsEval;
+    }
+  else if ((uint32_t) res->ulPropTag == PR_SUBJECT_UNICODE)
+    {
+      EOQualifier *subjectQualifier, *nSubjectQualifier, *subjectPQualifier;
+      EOQualifier *orQualifier, *andQualifier;
+      struct mapi_SPropertyRestriction subRes;
+      char *colPtr, *prefix;
+
+      [super evaluatePropertyRestriction: res
+                           intoQualifier: &subjectQualifier];
+
+      subRes.relop = res->relop;
+      subRes.ulPropTag = PR_NORMALIZED_SUBJECT_UNICODE;
+      subRes.lpProp.ulPropTag = PR_NORMALIZED_SUBJECT_UNICODE;
+
+      colPtr = strstr (res->lpProp.value.lpszW, ":");
+      if (colPtr)
+        subRes.lpProp.value.lpszW = colPtr + 1;
+      else
+        subRes.lpProp.value.lpszW = res->lpProp.value.lpszW;
+
+      [self evaluatePropertyRestriction: &subRes
+                          intoQualifier: &nSubjectQualifier];
+      if (colPtr)
+        {
+          prefix = strndup (res->lpProp.value.lpszW, (colPtr - res->lpProp.value.lpszW));
+
+          subRes.relop = RELOP_EQ;
+          subRes.ulPropTag = PR_SUBJECT_PREFIX_UNICODE;
+          subRes.lpProp.ulPropTag = PR_SUBJECT_PREFIX_UNICODE;
+          subRes.lpProp.value.lpszW = prefix;
+          [self evaluatePropertyRestriction: &subRes
+                              intoQualifier: &subjectPQualifier];
+          free (prefix);
+
+          andQualifier = [[EOOrQualifier alloc]
+                          initWithQualifiers:
+                             subjectPQualifier, nSubjectQualifier, nil];
+          orQualifier = [[EOOrQualifier alloc]
+                          initWithQualifiers:
+                            subjectQualifier, andQualifier, nil];
+          [andQualifier release];
+        }
+      else
+        orQualifier = [[EOOrQualifier alloc]
+                          initWithQualifiers:
+                          subjectQualifier, nSubjectQualifier, nil];
+      [orQualifier autorelease];
+      *qualifier = orQualifier;
+      rc = MAPIRestrictionStateNeedsEval;
+    }
+  else
+    rc = [super evaluatePropertyRestriction: res intoQualifier: qualifier];
+
+  return rc;
+}
+
+@end
@@ -0,0 +1,33 @@
+/* MAPIStoreEmbeddedMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREEMBEDDEDMESSAGE_H
+#define MAPISTOREEMBEDDEDMESSAGE_H
+
+#import "MAPIStoreMessage.h"
+
+@interface MAPIStoreEmbeddedMessage : MAPIStoreMessage
+
+@end
+
+
+#endif /* MAPISTOREEMBEDDEDMESSAGE_H */
@@ -0,0 +1,154 @@
+/* MAPIStoreEmbeddedMessage.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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/NSString.h>
+
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreFolder.h"
+#import "NSObject+MAPIStore.h"
+
+#import "MAPIStoreEmbeddedMessage.h"
+
+#include <mapistore/mapistore_errors.h>
+
+static Class MAPIStoreAttachmentK;
+
+@implementation MAPIStoreEmbeddedMessage
+
+ (void) initialize
+{
+  MAPIStoreAttachmentK = [MAPIStoreAttachment class];
+}
+
+- (uint64_t) objectId
+{
+  NSString *objectKey;
+  MAPIStoreMessage *grandParent;
+
+  grandParent = (MAPIStoreMessage *) [container container];
+
+  /* FIXME: this is a hack */
+  objectKey = [NSString stringWithFormat: @"%@/%@/as-message",
+                        [grandParent nameInContainer],
+                        [container nameInContainer], 
+                        [self nameInContainer]];
+
+  return [(MAPIStoreFolder *) [grandParent container]
+           idForObjectWithKey: objectKey];
+}
+
+- (int) getPidTagAccessLevel: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getLongZero: data inMemCtx: memCtx];
+}
+
+/* disabled properties */
+- (int) getPidTagFolderId: (void **) data
+                 inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagChangeKey: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagSourceKey: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagParentSourceKey: (void **) data
+                        inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagChangeNumber: (void **) data
+                     inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagInstID: (void **) data
+               inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagInstanceNum: (void **) data
+                    inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagRowType: (void **) data
+                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagDepth: (void **) data
+              inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagIconIndex: (void **) data
+                  inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagGenerateExchangeViews: (void **) data
+                              inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+- (int) getPidTagOriginalMessageClass: (void **) dataa
+                             inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return MAPISTORE_ERR_NOT_FOUND;
+}
+
+/* common methods */
+- (NSString *) nameInContainer
+{
+  return @"as-message";
+}
+
+- (uint64_t) objectVersion
+{
+  return ULLONG_MAX;
+}
+
+- (void) save: (TALLOC_CTX *) memCtx
+{
+  [self subclassResponsibility: _cmd];
+}
+
+@end
@@ -0,0 +1,31 @@
+/* MAPIStoreFAIMessage.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREFAIMESSAGE_H
+#define MAPISTOREFAIMESSAGE_H
+
+#import "MAPIStoreDBMessage.h"
+
+@interface MAPIStoreFAIMessage : MAPIStoreDBMessage
+@end
+
+#endif /* MAPISTOREFAIMESSAGE_H */
@@ -0,0 +1,80 @@
+/* MAPIStoreFAIMessage.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 <SOGo/SOGoUser.h>
+
+#import "MAPIStoreActiveTables.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreUserContext.h"
+#import "NSObject+MAPIStore.h"
+
+#import "MAPIStoreFAIMessage.h"
+
+#undef DEBUG
+#include <stdbool.h>
+#include <talloc.h>
+#include <util/time.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+
+@implementation MAPIStoreFAIMessage
+
+- (NSArray *) activeContainerMessageTables
+{
+  return [[MAPIStoreActiveTables activeTables]
+             activeTablesForFMID: [container objectId]
+                         andType: MAPISTORE_FAI_TABLE];
+}
+
+- (int) getPidTagAssociated: (void **) data
+                   inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getYes: data inMemCtx: memCtx];
+}
+
+- (enum mapistore_error) saveMessage: (TALLOC_CTX *) memCtx;
+{
+  enum mapistore_error rc;
+  MAPIStoreContext *context;
+  SOGoUser *ownerUser;
+
+  context = [self context];
+  ownerUser = [[self userContext] sogoUser];
+  if ([[context activeUser] isEqual: ownerUser])
+    rc = [super saveMessage: memCtx];
+  else
+    rc = MAPISTORE_ERR_DENIED;
+
+  return rc;
+}
+
+- (BOOL) subscriberCanReadMessage
+{
+  return NO;
+}
+
+- (BOOL) subscriberCanModifyMessage
+{
+  return NO;
+}
+
+@end
@@ -0,0 +1,31 @@
+/* MAPIStoreFAIMessageTable.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 MAPISTOREFAIMESSAGETABLE_H
+#define MAPISTOREFAIMESSAGETABLE_H
+
+#import "MAPIStoreDBMessageTable.h"
+
+@interface MAPIStoreFAIMessageTable : MAPIStoreDBMessageTable
+@end
+
+#endif /* MAPISTOREFAIMESSAGETABLE_H */
@@ -0,0 +1,101 @@
+/* MAPIStoreFAIMessageTable.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 "MAPIStoreFAIMessage.h"
+#import "MAPIStoreFolder.h"
+
+#import "MAPIStoreFAIMessageTable.h"
+
+#undef DEBUG
+#include <talloc.h>
+#include <util/time.h>
+#include <mapistore/mapistore.h>
+
+static Class MAPIStoreFAIMessageK = Nil;
+
+@implementation MAPIStoreFAIMessageTable
+
+ (void) initialize
+{
+  MAPIStoreFAIMessageK = [MAPIStoreFAIMessage class];
+}
+
+ (Class) childObjectClass
+{
+  return MAPIStoreFAIMessageK;
+}
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      tableType = MAPISTORE_FAI_TABLE;
+    }
+
+  return self;
+}
+
+- (NSArray *) childKeys
+{
+  if (!childKeys)
+    {
+      childKeys = [(MAPIStoreFolder *)
+                    container faiMessageKeysMatchingQualifier: nil
+                                             andSortOrderings: sortOrderings];
+      [childKeys retain];
+    }
+
+  return childKeys;
+}
+
+- (NSArray *) restrictedChildKeys
+{
+  NSArray *keys;
+
+  if (!restrictedChildKeys)
+    {
+      if (restrictionState != MAPIRestrictionStateAlwaysTrue)
+        {
+          if (restrictionState == MAPIRestrictionStateNeedsEval)
+            keys = [(MAPIStoreFolder *)
+                     container faiMessageKeysMatchingQualifier: restriction
+                                              andSortOrderings: sortOrderings];
+          else
+            keys = [NSArray array];
+        }
+      else
+        keys = [self childKeys];
+
+      ASSIGN (restrictedChildKeys, keys);
+    }
+
+  return restrictedChildKeys;
+}
+
+- (id) lookupChild: (NSString *) childKey
+{
+  return [(MAPIStoreFolder *) container lookupFAIMessage: childKey];
+}
+
+@end
@@ -0,0 +1,32 @@
+/* MAPIStoreFallbackContext.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc.
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTOREFALLBACKCONTEXT_H
+#define MAPISTOREFALLBACKCONTEXT_H
+
+#import "MAPIStoreDBBaseContext.h"
+
+@interface MAPIStoreFallbackContext : MAPIStoreDBBaseContext
+
+@end
+
+#endif /* MAPISTOREFALLBACKCONTEXT_H */
@@ -0,0 +1,105 @@
+/* MAPIStoreFallbackContext.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2014 Inverse inc.
+ *
+ * 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/NSString.h>
+#import <Foundation/NSURL.h>
+
+#import "MAPIStoreUserContext.h"
+#import "NSString+MAPIStore.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
+
+#import "MAPIStoreFallbackContext.h"
+
+#undef DEBUG
+#include <inttypes.h>
+#include <mapistore/mapistore.h>
+
+@implementation MAPIStoreFallbackContext
+
+ (NSString *) MAPIModuleName
+{
+  return @"fallback";
+}
+
+ (enum mapistore_context_role) MAPIContextRole
+{
+  return MAPISTORE_MAIL_ROLE;
+}
+
+ (struct mapistore_contexts_list *) listContextsForUser: (NSString *)  userName
+                                         withIndexing: (struct indexing_context *) indexing
+                                                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  struct mapistore_contexts_list *firstContext = NULL, *context;
+  SOGoCacheGCSFolder *root;
+  NSArray *names;
+  NSUInteger count, max;
+  NSString *baseURL, *url, *name;
+  MAPIStoreUserContext *userContext;
+
+  baseURL = [NSString stringWithFormat: @"sogo://%@@fallback/", userName];
+
+  context = talloc_zero (memCtx, struct mapistore_contexts_list);
+  context->url = [baseURL asUnicodeInMemCtx: context];
+  context->name = "Fallback";
+  context->main_folder = true;
+  context->role = MAPISTORE_FALLBACK_ROLE;
+  context->tag = "tag";
+
+  DLIST_ADD_END (firstContext, context, void);
+
+  /* Maybe emsmdbp_provisioning should be fixed in order to only take the uri
+     returned above to avoid deleting its entries... */
+  root = [SOGoCacheGCSFolder objectWithName: [self MAPIModuleName]
+                              inContainer: nil];
+  [root setOwner: userName];
+  userContext = [MAPIStoreUserContext userContextWithUsername: userName
+                                               andTDBIndexing: indexing];
+  [userContext ensureFolderTableExists];
+  [root setTableUrl: [userContext folderTableURL]];
+  names = [root toManyRelationshipKeys];
+  max = [names count];
+  for (count = 0; count < max; count++)
+    {
+      name = [names objectAtIndex: count];
+      url = [NSString stringWithFormat: @"%@%@/", baseURL, name];
+      context = talloc_zero (memCtx, struct mapistore_contexts_list);
+      context->url = [url asUnicodeInMemCtx: context];
+      context->name = [name asUnicodeInMemCtx: context];
+      context->main_folder = false;
+      context->role = MAPISTORE_FALLBACK_ROLE;
+      context->tag = "tag";
+      DLIST_ADD_END (firstContext, context, void);
+    }
+
+  return firstContext;
+}
+
+ (NSString *)
+ createRootSecondaryFolderWithFID: (uint64_t) fid
+                          andName: (NSString *) folderName
+                          forUser: (NSString *) userName
+{
+  return [NSString stringWithFormat: @"sogo://%@@fallback/0x%.16"PRIx64"/",
+                   userName, (unsigned long long) fid];
+}
+
+@end
@@ -0,0 +1,196 @@
+/* MAPIStoreFolder.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011-2014 Inverse inc
+ *
+ * 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 MAPISTOREFOLDER_H
+#define MAPISTOREFOLDER_H
+
+#import <Foundation/NSObject.h>
+
+@class NSArray;
+@class NSMutableArray;
+@class NSNumber;
+
+@class EOQualifier;
+
+@class MAPIStoreContext;
+@class MAPIStoreMessage;
+@class MAPIStoreFAIMessageTable;
+@class MAPIStoreFolderTable;
+@class MAPIStoreMessageTable;
+@class MAPIStorePermissionsTable;
+@class SOGoFolder;
+@class SOGoCacheGCSFolder;
+@class SOGoMAPIDBMessage;
+
+#import "MAPIStoreSOGoObject.h"
+
+@interface MAPIStoreFolder : MAPIStoreSOGoObject
+{
+  MAPIStoreContext *context;
+  // NSArray *messageKeys;
+  // NSArray *faiMessageKeys;
+  // NSArray *folderKeys;
+
+  SOGoCacheGCSFolder *dbFolder;
+  // SOGoMAPIDBFolder *faiFolder;
+  // SOGoMAPIDBFolder *propsFolder;
+  // SOGoMAPIDBMessage *propsMessage;
+}
+
+- (void) setContext: (MAPIStoreContext *) newContext;
+
+- (void) setupAuxiliaryObjects;
+
+- (SOGoCacheGCSFolder *) dbFolder;
+
+- (NSArray *) activeMessageTables;
+- (NSArray *) activeFAIMessageTables;
+
+// - (SOGoMAPIDBMessage *) propertiesMessage;
+
+- (NSString *) childKeyFromURL: (NSString *) childURL;
+
+- (id) lookupMessageByURL: (NSString *) messageURL;
+- (id) lookupFolderByURL: (NSString *) folderURL;
+
+/* permissions */
+- (MAPIStorePermissionsTable *) permissionsTable;
+- (NSArray *) permissionEntries;
+
+/* message objects and tables */
+- (id) lookupMessage: (NSString *) messageKey;
+- (NSArray *) messageKeys;
+
+/* FAI message objects and tables */
+- (id) lookupFAIMessage: (NSString *) messageKey;
+- (MAPIStoreFAIMessageTable *) faiMessageTable;
+- (NSArray *) faiMessageKeys;
+- (NSArray *) faiMessageKeysMatchingQualifier: (EOQualifier *) qualifier
+                             andSortOrderings: (NSArray *) sortOrderings;
+
+/* folder objects and tables */
+- (id) lookupFolder: (NSString *) folderKey;
+- (MAPIStoreFolderTable *) folderTable;
+- (NSArray *) folderKeys;
+- (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
+                         andSortOrderings: (NSArray *) sortOrderings;
+
+- (MAPIStoreMessage *) createMessage: (BOOL) isAssociated;
+
+/* 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;
+
+- (int) 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;
+
+- (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) moveCopyToFolder: (MAPIStoreFolder *) targetFolder
+                              withNewName: (NSString *) newFolderName
+                                   isMove: (BOOL) isMove
+                              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;
+
+- (int) 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) preloadMessageBodiesWithMIDs: (const struct UI8Array_r *) mids
+                                          ofTableType: (enum mapistore_table_type) tableType;
+
+
+/* helpers */
+- (uint64_t) idForObjectWithKey: (NSString *) childKey;
+
+/* subclasses */
+- (MAPIStoreMessage *) createMessage;
+- (MAPIStoreMessageTable *) messageTable;
+- (NSArray *) messageKeysMatchingQualifier: (EOQualifier *) qualifier
+                          andSortOrderings: (NSArray *) sortOrderings;
+- (NSArray *) getDeletedKeysFromChangeNumber: (uint64_t) changeNum
+                                       andCN: (NSNumber **) cnNbr
+                                 inTableType: (enum mapistore_table_type) tableType;
+
+- (enum mapistore_error) createFolder: (struct SRow *) aRow
+                              withFID: (uint64_t) newFID
+                               andKey: (NSString **) newKeyP;
+
+- (NSCalendarDate *) lastMessageModificationTime;
+
+- (SOGoFolder *) aclFolder;
+- (NSArray *) rolesForExchangeRights: (uint32_t) rights;
+- (uint32_t) exchangeRightsForRoles: (NSArray *) roles;
+
+- (BOOL) subscriberCanCreateMessages;
+- (BOOL) subscriberCanModifyMessages;
+- (BOOL) subscriberCanReadMessages;
+- (BOOL) subscriberCanDeleteMessages;
+- (BOOL) subscriberCanCreateSubFolders;
+
+- (BOOL) supportsSubFolders; /* capability */
+
+- (enum mapistore_error) preloadMessageBodiesWithKeys: (NSArray *) keys
+                                          ofTableType: (enum mapistore_table_type) tableType;
+
+/* subclass helpers */
+- (void) setupVersionsMessage;
+- (void) ensureIDsForChildKeys: (NSArray *) keys;
+- (void) postNotificationsForMoveCopyMessagesWithMIDs: (uint64_t *) srcMids
+                                       andMessageURLs: (NSArray *) oldMessageURLs
+                                             andCount: (uint32_t) midCount
+                                           fromFolder: (MAPIStoreFolder *) sourceFolder
+                                             withMIDs: (uint64_t *) targetMids
+                                             wantCopy: (uint8_t) wantCopy;
+
+@end
+
+#endif /* MAPISTOREFOLDER_H */
@@ -0,0 +1,31 @@
+/* MAPIStoreFolderTable.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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.
+ */
+
+#ifndef MAPISTOREFOLDERTABLE_H
+#define MAPISTOREFOLDERTABLE_H
+
+#import "MAPIStoreTable.h"
+
+@interface MAPIStoreFolderTable : MAPIStoreTable
+@end
+
+#endif /* MAPISTOREFOLDERTABLE_H */
@@ -0,0 +1,118 @@
+/* MAPIStoreFolderTable.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010-2012 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * 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 <NGExtensions/NSObject+Logs.h>
+
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreTypes.h"
+
+#import "MAPIStoreFolderTable.h"
+
+#undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_nameid.h>
+#include <libmapiproxy.h>
+
+@implementation MAPIStoreFolderTable
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      tableType = MAPISTORE_FOLDER_TABLE;
+    }
+
+  return self;
+}
+
+- (NSArray *) childKeys
+{
+  if (!childKeys)
+    {
+      childKeys = [(MAPIStoreFolder *)
+                    container folderKeysMatchingQualifier: nil
+                                         andSortOrderings: sortOrderings];
+      [childKeys retain];
+    }
+
+  return childKeys;
+}
+
+- (NSArray *) restrictedChildKeys
+{
+  NSArray *keys;
+
+  /* FIXME: restrictions are ignored on folder tables */
+
+  if (!restrictedChildKeys)
+    {
+      if (restrictionState != MAPIRestrictionStateAlwaysTrue)
+        {
+          if (restrictionState == MAPIRestrictionStateNeedsEval)
+            keys = [(MAPIStoreFolder *)
+                     container folderKeysMatchingQualifier: restriction
+                                          andSortOrderings: sortOrderings];
+          else
+            keys = [NSArray array];
+        }
+      else
+        keys = [self childKeys];
+
+      ASSIGN (restrictedChildKeys, keys);
+    }
+
+  return restrictedChildKeys;
+}
+
+- (MAPIRestrictionState) evaluatePropertyRestriction: (struct mapi_SPropertyRestriction *) res
+				       intoQualifier: (EOQualifier **) qualifier
+{
+  MAPIRestrictionState rc;
+
+  switch ((uint32_t) res->ulPropTag)
+    {
+      /* HACK: we cheat here as we current have no mechanism for searching
+         folders based on PR_CHANGE_NUM, which is used by the oxcfxics
+         mechanism... */
+    case PidTagChangeNumber:
+      rc = MAPIRestrictionStateAlwaysTrue;
+      break;
+    default:
+      rc = [super evaluatePropertyRestriction: res intoQualifier: qualifier];
+    }
+
+  return rc;
+}
+
+- (id) lookupChild: (NSString *) childKey
+{
+  return [(MAPIStoreFolder *) container lookupFolder: childKey];
+}
+
+- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
+{
+  return nil;
+}
+
+@end
Author	SHA1	Message	Date
Ludovic Marcotte	74b27a771a	Merge to 2.2.14	2015-01-20 08:35:54 -05:00
Ludovic Marcotte	2ae326c41f	Merge to 2.2.13	2014-12-30 08:01:52 -05:00
Ludovic Marcotte	562d3db1a6	Merge to 2.2.12a	2014-12-19 09:04:01 -05:00
Ludovic Marcotte	d3914ae8a8	Merge to 2.2.12	2014-12-18 08:57:15 -05:00
Ludovic Marcotte	97135f2afa	Merge to 2.2.11a	2014-12-10 15:24:12 -05:00
Ludovic Marcotte	3e14825fe2	Merge to 2.2.11a	2014-12-10 14:25:11 -05:00
Ludovic Marcotte	93d190060e	Merge to 2.2.11	2014-12-09 09:09:58 -05:00
Ludovic Marcotte	1f299c7a1a	Merge to 2.2.10 Conflicts: NEWS Version	2014-11-21 09:17:28 -05:00
Ludovic Marcotte	74cfb901fd	Updated for the 2.2.9a release	2014-09-29 15:20:22 -04:00
Ludovic Marcotte	065fd5d9b5	Simplified even more -safeString	2014-09-29 15:17:05 -04:00
Ludovic Marcotte	bf547dd3fe	Fixed sanitization char skipping and #2936	2014-09-29 15:15:30 -04:00
Francis Lachapelle	81e47c59cd	Fix URL in documentation	2014-09-29 15:15:23 -04:00
Ludovic Marcotte	7862cda661	Merge to 2.2.9	2014-09-26 14:32:47 -04:00
Ludovic Marcotte	329552030b	Merge to 2.2.8	2014-09-10 14:17:14 -04:00
Ludovic Marcotte	04904d8c61	Merge to 2.2.6	2014-07-02 11:41:46 -04:00
Francis Lachapelle	f0b4a05c70	Merge to 2.2.5	2014-06-05 13:35:45 -04:00
Francis Lachapelle	95d6911f1a	Merge to 2.2.4	2014-05-29 11:17:46 -04:00
Francis Lachapelle	48f98ef34e	Merge to 2.2.3	2014-04-03 10:06:08 -04:00
Francis Lachapelle	ae0c5eae77	Merge to 2.2.2	2014-03-21 15:39:00 -04:00
Francis Lachapelle	0c2d727057	Merge to 2.2.2	2014-03-21 15:33:55 -04:00
Francis Lachapelle	072f5f5a15	Merge to 2.2.1	2014-03-07 14:03:41 -05:00
Francis Lachapelle	1db85743a0	Merge to 2.2.0	2014-02-24 16:54:11 -05:00
Jean Raby	2cf66e037d	Merge to 2.1.1	2013-11-19 14:00:22 -05:00
Francis Lachapelle	449d838dc2	Merge to 2.1.0	2013-11-07 14:43:19 -05:00
Francis Lachapelle	c4bc215a47	Merge to 2.0.7	2013-07-23 10:02:39 -04:00
Francis Lachapelle	c9936d7ecf	Merge to 2.0.7	2013-07-23 08:38:44 -04:00
Francis Lachapelle	885e59a2af	Merge to 2.0.7	2013-07-19 13:46:37 -04:00
Jean Raby	bf398889bf	Merge to 2.0.6b	2013-06-27 11:36:30 -04:00
Ludovic Marcotte	e26e3d7307	Revert "Properly escape the foldername to avoid XSS issues" This reverts commit `045b275b27`.	2013-06-27 11:15:41 -04:00
Ludovic Marcotte	045b275b27	Properly escape the foldername to avoid XSS issues	2013-06-27 11:06:07 -04:00
Jean Raby	7ec1973e0f	Merge to 2.0.6a	2013-06-25 09:22:35 -04:00
Ludovic Marcotte	a79a9c4eff	Merge to 2.0.6 Conflicts: Documentation/SOGo Installation Guide.odt	2013-06-21 12:44:35 -04:00
Jean Raby	f049e2430a	Added ldap attribute mapping table	2013-04-22 12:25:22 -04:00
Jean Raby	59b3219f2d	Merge to 2.05a	2013-04-16 15:20:19 -04:00
Francis Lachapelle	e9eb8bdc86	Merge to 2.0.5	2013-04-11 12:56:34 -04:00
Francis Lachapelle	5e0c7ae4f2	Merge to 2.0.4b	2013-02-04 14:24:46 -05:00
Francis Lachapelle	c1c0c1ab44	Merge to 2.0.4a	2013-01-30 08:54:00 -05:00
Francis Lachapelle	a59fff785b	Merge to 2.0.4	2013-01-25 14:01:10 -05:00
Francis Lachapelle	6a70db80e6	Merge to 2.0.3a	2012-12-07 09:35:03 -05:00
Francis Lachapelle	d610630c8d	Merge to 2.0.3 (again)	2012-12-06 13:08:47 -05:00
Francis Lachapelle	4dc7790015	Merge to 2.0.3	2012-12-06 10:40:33 -05:00
Francis Lachapelle	9dd000a2ca	Merge to 2.0.2 Merge commit '1080bee3ba9749aad0dc28625081fc6a496f7280' into maint Conflicts: OpenChange/MAPIStoreContext.h OpenChange/MAPIStoreContext.m	2012-11-15 10:10:48 -05:00
Wolfgang Sourdeau	ce4084e528	getNewChangeNumbers: new wrapper for openchangedb_get_new_changeNumbers	2012-10-12 16:55:27 -04:00