Update ChangeLog

Preparation for release 4.0.3
(css) Update default theme
2018-10-17 11:18:38 -04:00 · 2018-10-17 11:18:04 -04:00 · 2018-10-17 11:15:09 -04:00 · 2018-10-17 11:07:17 -04:00 · 2018-10-17 11:04:06 -04:00 · 2018-10-17 10:58:39 -04:00
1409 changed files with 81110 additions and 33201 deletions
@@ -19,8 +19,6 @@ UI/WebServerResources/.bowerrc
 UI/WebServerResources/.sass-cache/
 UI/WebServerResources/bower_components/
 UI/WebServerResources/css/
-UI/WebServerResources/css/styles.css
-UI/WebServerResources/css/styles.css.map
 UI/WebServerResources/js/*.js
 UI/WebServerResources/js/*.js.map
 UI/WebServerResources/js/vendor/*.js
@@ -20,7 +20,9 @@ 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.ja = UI/MailerUI/Japanese.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
@@ -28,6 +30,7 @@ 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.ro_RO = UI/MailerUI/Romanian.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
@@ -35,6 +38,7 @@ 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]
@@ -56,7 +60,9 @@ 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.ja = UI/PreferencesUI/Japanese.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
@@ -64,6 +70,7 @@ 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.ro_RO = UI/PreferencesUI/Romanian.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
@@ -71,6 +78,7 @@ 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]
@@ -92,7 +100,9 @@ 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.ja = UI/Scheduler/Japanese.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
@@ -100,6 +110,7 @@ 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.ro_RO = UI/Scheduler/Romanian.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
@@ -107,6 +118,7 @@ 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]
@@ -128,7 +140,9 @@ 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.ja = UI/Contacts/Japanese.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
@@ -136,6 +150,7 @@ 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.ro_RO = UI/Contacts/Romanian.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
@@ -143,6 +158,7 @@ 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]
@@ -164,7 +180,9 @@ 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.ja = UI/MainUI/Japanese.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
@@ -172,6 +190,7 @@ 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.ro_RO = UI/MainUI/Romanian.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
@@ -179,6 +198,7 @@ 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]
@@ -200,7 +220,9 @@ 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.ja = UI/Common/Japanese.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
@@ -208,6 +230,7 @@ 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.ro_RO = UI/Common/Romanian.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
@@ -215,6 +238,7 @@ 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]
@@ -236,7 +260,9 @@ 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.ja = UI/AdministrationUI/Japanese.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
@@ -244,6 +270,7 @@ 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.ro_RO = UI/AdministrationUI/Romanian.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
@@ -251,6 +278,7 @@ 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]
@@ -272,7 +300,9 @@ 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.ja = SoObjects/Appointments/Japanese.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
@@ -280,6 +310,7 @@ 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.ro_RO = SoObjects/Appointments/Romanian.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
@@ -287,6 +318,7 @@ 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]
@@ -308,7 +340,9 @@ 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.ja = SoObjects/Contacts/Japanese.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
@@ -316,6 +350,7 @@ 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.ro_RO = SoObjects/Contacts/Romanian.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
@@ -323,6 +358,7 @@ 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]
@@ -344,7 +380,9 @@ 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.ja = SoObjects/Mailer/Japanese.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
@@ -352,6 +390,7 @@ 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.ro_RO = SoObjects/Mailer/Romanian.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
@@ -359,6 +398,7 @@ 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]
@@ -380,7 +420,9 @@ 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.ja = UI/MailPartViewers/Japanese.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
@@ -388,6 +430,7 @@ 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.ro_RO = UI/MailPartViewers/Romanian.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
@@ -395,4 +438,5 @@ 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
@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <Foundation/NSString.h>

 static NSArray *asElementArray = nil;
+static NSArray *considerAsSameArray = nil;

@implementation NGDOMElement (ActiveSync)

@@ -101,7 +102,44 @@ static NSArray *asElementArray = nil;
  int i, count;
  
  if (!asElementArray)
-    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", @"Exception", nil];
+    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", @"Exception", @"Add", @"Delete", nil];
+
+// FIXME
+/* if the client sends
+<attachments>
+<add>
+...
+</add>
+<add>
+...
+</add>
+</attachments>
+
+the result is a NSarray i.e. {add1; add2; ...}
+
+if the client sends
+
+<attachments>
+<add>
+...
+</add>
+<add>
+...
+</add>
+<delete>
+...
+</delete>
+<delete>
+...
+</delete>
+</attachments>
+
+
+the result is a NSDictionary ie. Add = { }; Delete = { }; the dictionary would contain only one entry for add
+*/
+  if (!considerAsSameArray)
+    considerAsSameArray = [[NSArray alloc] initWithObjects: @"Add", @"Delete", nil];
+

  data = [NSMutableDictionary dictionary];

@@ -151,7 +189,7 @@ static NSArray *asElementArray = nil;
                      if (!innerTag)
                        innerTag = [innerElement tagName];

-                      if ([innerTag isEqualToString: [innerElement tagName]])
+                      if ([innerTag isEqualToString: [innerElement tagName]] || [considerAsSameArray containsObject: innerTag])
                        {
                          if ([(id)innerElement isTextNode])
                            [innerElements addObject: [(NGDOMElement *)innerElement textValue]];
@@ -53,9 +53,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <SOGo/SOGoCacheGCSObject.h>
 #import <SOGo/SOGoPermissions.h>

+#import <NGCards/iCalCalendar.h>
+
 #import <Appointments/iCalEntityObject+SOGo.h>
 #import <Appointments/SOGoAppointmentObject.h>
 #import <Appointments/SOGoTaskObject.h>
+#import <Appointments/SOGoAppointmentFolder.h>

 #import <Contacts/SOGoContactGCSEntry.h>

@@ -149,7 +152,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  processIdentifierInCache = [[self globalMetadataForDevice] objectForKey: key];

  // Don't update the cache if another request is processing the same collection.
-  // I case of a merged folder we have to check personal folder's lock.
+  // In case of a merged folder we have to check personal folder's lock.
  a = [key componentsSeparatedByString: @"/"];
  pkey = [NSString stringWithFormat: @"%@/personal", [a objectAtIndex:0]];

@@ -227,7 +230,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  return nameInCache;
 }

+- (void) _removeAllAlarmsFromCalendar: (iCalCalendar *) theCalendar
+{
+  NSArray *allComponents;
+  iCalEntityObject *currentComponent;
+  NSUInteger count, max;

+  if (debugOn)
+   [self logWithFormat: @"EAS - Remove all alarms"];
+
+  allComponents = [theCalendar allObjects];
+
+  max = [allComponents count];
+  for (count = 0; count < max; count++)
+    {
+      currentComponent = [allComponents objectAtIndex: count];
+      if ([currentComponent isKindOfClass: [iCalEvent class]] ||
+          [currentComponent isKindOfClass: [iCalToDo class]])
+        [currentComponent removeAllAlarms];
+    }
+}

 //
 // <?xml version="1.0"?>
@@ -289,8 +311,34 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          anAddition = [additions objectAtIndex: i];
          is_new = YES;

-          clientId = [[(id)[anAddition getElementsByTagName: @"ClientId"] lastObject] textValue];
+
+/*
+FIXME
+    <Add>
+     <ClientId>338</ClientId>
+     <ApplicationData>
+      <To xmlns="Email:">&lt;foot@bar.com&gt;</To>
+      <Cc xmlns="Email:"/>
+      <Subject xmlns="Email:">test</Subject>
+      <Reply-To xmlns="Email:">foo@bar.com</Reply-To>
+      <Importance xmlns="Email:">1</Importance>
+      <Read xmlns="Email:">1</Read>
+      <Attachments xmlns="AirSyncBase:">
+       <Add>
+        <ClientId>152-ab557915-8451-49a7-a9c6-a9ac153021ad</ClientId>
+
+
+-> lastObject returns the ClientId in Attachments element -> try with objectAtIndex: 0 -> is this correct?
+*/
+          //clientId = [[(id)[anAddition getElementsByTagName: @"ClientId"] lastObject] textValue];
+          clientId = [[(id)[anAddition getElementsByTagName: @"ClientId"] objectAtIndex: 0] textValue];
+
          allValues = [NSMutableDictionary dictionaryWithDictionary: [[(id)[anAddition getElementsByTagName: @"ApplicationData"]  lastObject] applicationData]];
+
+          // FIXME: ignore the <Add> elements of Attachemnts - above  (id)[theDocumentElement getElementsByTagName: @"Add"]; return any <Add> elements instead of only the direct childs of the <commands> element ..
+          if (![allValues count])
+            continue;
+
          
          switch (theFolderType)
            {
@@ -309,8 +357,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                // the case, let's just update it. This can happen if for example, an iOS based device receives the
                // invitation email and choses "Add to calendar" BEFORE actually syncing the calendar. That would
                // create a duplicate on the server.
-                if ([allValues objectForKey: @"UID"])
-                  serverId = [allValues objectForKey: @"UID"];
+                if ([allValues objectForKey: ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 16.0) ? @"ClientUid" : @"UID"])
+                  serverId = [allValues objectForKey: ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 16.0) ? @"ClientUid" : @"UID"];
                else
                  serverId = [theCollection globallyUniqueObjectId];
                                
@@ -345,9 +393,49 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            case ActiveSyncMailFolder:
            default:
              {
-                // FIXME - what to do?
-                [self errorWithFormat: @"Fatal error occured - tried to call -processSyncAddCommand: ... on a mail folder. We abort."];
-                abort();
+                 // Support Draft Mail/SMS to Exchange eMail sync.
+                 NSString *serverId;
+                 NSMutableString *s;
+                 NSDictionary *result;
+                 NSNumber *modseq;
+
+                 serverId = nil;
+                 s = [NSMutableString string];
+
+                 sogoObject = [SOGoMailObject objectWithName: @"Mail" inContainer: theCollection];
+                 serverId = [sogoObject storeMail: allValues  inBuffer: s inContext: context];
+                 if (serverId)
+                   {
+                     sogoObject = [theCollection lookupName: serverId inContext: context acquire: 0];
+                     [sogoObject takeActiveSyncValues: allValues  inContext: context];
+
+                     // Everything is fine, lets generate our response
+                     [theBuffer appendString: @"<Add>"];
+                     [theBuffer appendFormat: @"<ClientId>%@</ClientId>", clientId];
+                     [theBuffer appendFormat: @"<ServerId>%@</ServerId>", serverId];
+                     [theBuffer appendFormat: @"<Status>%d</Status>", 1];
+                     [theBuffer appendString: s];
+                     [theBuffer appendString: @"</Add>"];
+
+
+                     folderMetadata = [self _folderMetadataForKey: [self _getNameInCache: theCollection withType: theFolderType]];
+                     syncCache = [folderMetadata objectForKey: @"SyncCache"];
+
+                     result = [sogoObject fetchParts: [NSArray arrayWithObject: @"MODSEQ"]];
+                     modseq = [[[result objectForKey: @"RawResponse"] objectForKey: @"fetch"] objectForKey: @"modseq"];
+
+                     [syncCache setObject: [modseq stringValue] forKey: serverId];
+
+                     [self _setFolderMetadata: folderMetadata  forKey: [self _getNameInCache: theCollection withType: theFolderType]];
+
+                     continue;
+                   }
+                 else
+                   {
+                     // FIXME - what to do?
+                     [self errorWithFormat: @"Fatal error occured - tried to call -processSyncAddCommand: ... on a mail folder. We abort."];
+                     abort();
+                   }
              }
            }

@@ -624,6 +712,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                NSDictionary *result;
                NSNumber *modseq;

+                // Process an update to a Draft Mail.
+                if ([allChanges objectForKey: @"Body"])
+                  {
+                    NSString *serverId;
+                    NSMutableString *s;
+
+                    serverId = nil;
+                    s = [NSMutableString string];
+
+                    serverId = [sogoObject storeMail: allChanges  inBuffer: s inContext: context];
+                    if (serverId)
+                      {
+                        // we delete the original email - next sync will update the client with the new mail
+                        [sogoObject delete];
+                        sogoObject = [theCollection lookupName: serverId inContext: context acquire: 0];
+                      }
+                  }
+
                [sogoObject takeActiveSyncValues: allChanges  inContext: context];

                result = [sogoObject fetchParts: [NSArray arrayWithObject: @"MODSEQ"]];
@@ -638,7 +744,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

          [theBuffer appendString: @"<Change>"];
          [theBuffer appendFormat: @"<ServerId>%@</ServerId>", origServerId];
-          [theBuffer appendFormat: @"<Status>%d</Status>", 1];
+
+          // A body element is sent only for draft mails - status 8 will delete the mail on the client - the next sync update fetch the new mail
+          if ([allChanges objectForKey: @"Body"] && theFolderType == ActiveSyncMailFolder)
+            [theBuffer appendFormat: @"<Status>%d</Status>", 8];
+          else
+            [theBuffer appendFormat: @"<Status>%d</Status>", 1];
+
          [theBuffer appendString: @"</Change>"];
        }
    }
@@ -760,7 +872,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              // FIXME: handle errors here
              if (deletesAsMoves && theFolderType == ActiveSyncMailFolder)
 		{
-		  [(SOGoMailFolder *)[sogoObject container] deleteUIDs: [NSArray arrayWithObjects: serverId, nil] useTrashFolder: &useTrash inContext: context];
+		  [(SOGoMailFolder *)[sogoObject container] deleteUIDs: [NSArray arrayWithObjects: serverId, nil]
+                                                        useTrashFolder: &useTrash
+                                                             inContext: context];
 		}
              else if (theFolderType == ActiveSyncEventFolder || theFolderType == ActiveSyncTaskFolder || theFolderType == ActiveSyncContactFolder)
                {
@@ -1221,6 +1335,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                      d = [NSCalendarDate distantFuture];

                    [dateCache setObject: d forKey: uid];
+
+                    if (!([theCollection showCalendarAlarms]))
+                      [self _removeAllAlarmsFromCalendar: [componentObject parent]];
                  }
                
                if (updated)
@@ -1334,7 +1451,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              }
          }

-        allMessages = [theCollection syncTokenFieldsWithProperties: nil  matchingSyncToken: theSyncKey  fromDate: theFilterType  initialLoad: initialLoadInProgress];
+        allMessages = [theCollection syncTokenFieldsWithProperties: nil
+                                                 matchingSyncToken: theSyncKey
+                                                          fromDate: theFilterType
+                                                       initialLoad: initialLoadInProgress];
        max = [allMessages count];
        
        allCacheObjects = [NSMutableArray array];
@@ -1581,7 +1701,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                    [s appendString: [mailObject activeSyncRepresentationInContext: context]];
                    [s appendString: @"</ApplicationData>"];
                    [s appendString: @"</Add>"];
-                    
+
                    [syncCache setObject: [aCacheObject sequence]  forKey: [aCacheObject uid]];
                    [dateCache setObject: [NSCalendarDate date]  forKey: [aCacheObject uid]];

@@ -2479,9 +2599,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // We enter our loop detection change
  for (i = 0; i < (heartbeatInterval/internalInterval); i++)
    {
+      // Terminate the process if we need to
      if ([self easShouldTerminate])
        break;

+      // We first check of any of the collections we want to sync are already
+      // in an other sync process. If that's the case, we do not do anything
+      // and we return immediately. So we'll let the other sync process terminate
+      for (j = 0; j < [allCollections count]; j++)
+        {
+          aCollection = [allCollections objectAtIndex: j];
+          globalMetadata = [self globalMetadataForDevice];
+
+          key = [NSString stringWithFormat: @"SyncRequest+%@", [[[(id)[aCollection getElementsByTagName: @"CollectionId"] lastObject] textValue] stringByUnescapingURL]];
+
+          if (!([[globalMetadata objectForKey: key] isEqual: processIdentifier]))
+            {
+              if (debugOn)
+                [self logWithFormat: @"EAS - Discard response %@", [self globalMetadataForDevice]];
+
+              [output appendString: @"<Status>13</Status>"];
+              [output appendString: @"</Sync>"];
+              d = [[output dataUsingEncoding: NSUTF8StringEncoding] xml2wbxml];
+              [theResponse setContent: d];
+              RELEASE(output);
+              return;
+            }
+
+        }
+
+      // We're good to go to sync the collections
      s = [NSMutableString string];

      for (j = 0; j < [allCollections count]; j++)
@@ -2493,21 +2640,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                       changeDetected: &changeDetected
                  maxSyncResponseSize: maxSyncResponseSize];

-          // Don't return a response if another Sync is waiting.
-          globalMetadata = [self globalMetadataForDevice];
-          key = [NSString stringWithFormat: @"SyncRequest+%@", [[[(id)[aCollection getElementsByTagName: @"CollectionId"] lastObject] textValue] stringByUnescapingURL]];
-
-          if (!([[globalMetadata objectForKey: key] isEqual: processIdentifier]))
-            {
-              if (debugOn)
-                [self logWithFormat: @"EAS - Discard response %@", [self globalMetadataForDevice]];
-
-              [theResponse setStatus: 503];
-
-              RELEASE(output);
-              return;
-            }
-
          if ((maxSyncResponseSize > 0 && [s length] >= maxSyncResponseSize))
            break;
        }
@@ -2540,7 +2672,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                {
 		  int t;

-                  [self logWithFormat: @"Sleeping %d seconds while detecting changes in Sync...", internalInterval-total_sleep];
+                  [self logWithFormat: @"Sleeping %d seconds while detecting changes for user %@ in Sync...", internalInterval-total_sleep, [[context activeUser] login]];

 		  for (t = 0; t < sleepInterval; t++)
 		    {
@@ -271,6 +271,39 @@ void handle_eas_terminate(int signum)
  return theIdToTranslate;
 }

+//
+//
+//
+- (SOGoAppointmentObject *) _eventObjectWithUID: (NSString *) uid
+{
+  SOGoAppointmentFolder *folder;
+  SOGoAppointmentObject *eventObject;
+  NSArray *folders;
+  NSEnumerator *e;
+  NSString *cname;
+
+  eventObject = nil;
+
+  folders = [[[context activeUser] calendarsFolderInContext: context] subFolders];
+  e = [folders objectEnumerator];
+  while (eventObject == nil && (folder = [e nextObject]))
+    {
+      cname = [folder resourceNameForEventUID: uid];
+      if (cname)
+        {
+          eventObject = [folder lookupName: cname inContext: context
+                                   acquire: NO];
+          if ([eventObject isKindOfClass: [NSException class]])
+            eventObject = nil;
+        }
+    }
+
+  if (eventObject)
+    return eventObject;
+  else
+    return [NSException exceptionWithHTTPStatus:404 /* Not Found */];
+}
+
 //
 //
 //
@@ -741,14 +774,14 @@ void handle_eas_terminate(int signum)
        {
          [[theFolders objectAtIndex: i] setObject: theExistingParent forKey: @"parent"];
          [[theFolders objectAtIndex: i] setObject:
-                 [[[[theFolders objectAtIndex: i] objectForKey: @"path"] substringFromIndex: [theExistingParent length]+1]stringByReplacingOccurrencesOfString:@"/" withString:@"."]
+                 [[[[[theFolders objectAtIndex: i] objectForKey: @"path"] substringFromIndex: [theExistingParent length]+1]stringByReplacingOccurrencesOfString:@"/" withString:@"."] stringByDecodingImap4FolderName]
             forKey: @"name"];
        }
      else if (![[[theFolders objectAtIndex: i] objectForKey: @"type"] isEqualToString: @"otherUsers"] &&
               ![[[theFolders objectAtIndex: i] objectForKey: @"type"] isEqualToString: @"shared"])
        {
          [[theFolders objectAtIndex: i] setObject:
-                 [[[theFolders objectAtIndex: i] objectForKey: @"path"] stringByReplacingOccurrencesOfString:@"/" withString:@"."]
+                 [[[[theFolders objectAtIndex: i] objectForKey: @"path"] stringByReplacingOccurrencesOfString:@"/" withString:@"."] stringByDecodingImap4FolderName]
             forKey: @"name"];
        }

@@ -1151,38 +1184,45 @@ void handle_eas_terminate(int signum)

               name = [NSString stringWithFormat: @"vtodo/%@", [[folders objectAtIndex:fi] nameInContainer]];
               type = ([[[folders objectAtIndex:fi] nameInContainer] isEqualToString: personalFolderName] ? 7 : 15);
-               [commands appendFormat: @"<%@><ServerId>%@</ServerId><ParentId>%@</ParentId><DisplayName>%@</DisplayName><Type>%d</Type></%@>", operation,
-                   [name stringByEscapingURL], @"0", [[[folders objectAtIndex:fi] displayName] activeSyncRepresentationInContext: context], type, operation];

-               command_count++;
-               key = [NSString stringWithFormat: @"%@+%@", [context objectForKey: @"DeviceId"], name];
-
-               o = [SOGoCacheGCSObject objectWithName: key  inContainer: nil];
-               [o setObjectType: ActiveSyncFolderCacheObject];
-               [o setTableUrl: [self folderTableURL]];
-               [o reloadIfNeeded];
-               [[o properties ]  setObject:  [[folders objectAtIndex:fi] displayName]  forKey: @"displayName"];
-
-               if ([operation isEqualToString: @"Add"])
+               // We always sync the "Default Tasks folder" (7). For "User-created Tasks folder" (15), we check if we include it in
+               // the sync process by checking if "Show tasks" is enabled. If not, we skip the folder entirely.
+               if (type == 7 ||
+                   (type == 15 && [[folders objectAtIndex: fi] showCalendarTasks]))
                 {
-                   // clean cache content to avoid stale data
-                   [[o properties] removeObjectForKey: @"SyncKey"];
-                   [[o properties] removeObjectForKey: @"SyncCache"];
-                   [[o properties] removeObjectForKey: @"DateCache"];
-                   [[o properties] removeObjectForKey: @"UidCache"];
-                   [[o properties] removeObjectForKey: @"MoreAvailable"];
-                   [[o properties] removeObjectForKey: @"BodyPreferenceType"];
-                   [[o properties] removeObjectForKey: @"SupportedElements"];
-                   [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"];
-                   [[o properties] removeObjectForKey: @"InitialLoadSequence"];
-                   [[o properties] removeObjectForKey: @"FirstIdInCache"];
-                   [[o properties] removeObjectForKey: @"LastIdInCache"];
-                   [[o properties] removeObjectForKey: @"MergedFoldersSyncKeys"];
-                   [[o properties] removeObjectForKey: @"MergedFolder"];
-                   [[o properties] removeObjectForKey: @"CleanoutDate"];
-                 }
+                   [commands appendFormat: @"<%@><ServerId>%@</ServerId><ParentId>%@</ParentId><DisplayName>%@</DisplayName><Type>%d</Type></%@>", operation,
+                             [name stringByEscapingURL], @"0", [[[folders objectAtIndex:fi] displayName] activeSyncRepresentationInContext: context], type, operation];

-               [o save];
+                   command_count++;
+
+                   key = [NSString stringWithFormat: @"%@+%@", [context objectForKey: @"DeviceId"], name];
+                   o = [SOGoCacheGCSObject objectWithName: key  inContainer: nil];
+                   [o setObjectType: ActiveSyncFolderCacheObject];
+                   [o setTableUrl: [self folderTableURL]];
+                   [o reloadIfNeeded];
+                   [[o properties ]  setObject:  [[folders objectAtIndex:fi] displayName]  forKey: @"displayName"];
+
+                   if ([operation isEqualToString: @"Add"])
+                     {
+                       // clean cache content to avoid stale data
+                       [[o properties] removeObjectForKey: @"SyncKey"];
+                       [[o properties] removeObjectForKey: @"SyncCache"];
+                       [[o properties] removeObjectForKey: @"DateCache"];
+                       [[o properties] removeObjectForKey: @"UidCache"];
+                       [[o properties] removeObjectForKey: @"MoreAvailable"];
+                       [[o properties] removeObjectForKey: @"BodyPreferenceType"];
+                       [[o properties] removeObjectForKey: @"SupportedElements"];
+                       [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"];
+                       [[o properties] removeObjectForKey: @"InitialLoadSequence"];
+                       [[o properties] removeObjectForKey: @"FirstIdInCache"];
+                       [[o properties] removeObjectForKey: @"LastIdInCache"];
+                       [[o properties] removeObjectForKey: @"MergedFoldersSyncKeys"];
+                       [[o properties] removeObjectForKey: @"MergedFolder"];
+                       [[o properties] removeObjectForKey: @"CleanoutDate"];
+                     }
+
+                   [o save];
+                 }
             } 
           else if ([[folders objectAtIndex:fi] isKindOfClass: [SOGoContactGCSFolder class]])
             {
@@ -1215,8 +1255,8 @@ void handle_eas_terminate(int signum)

               [o save];
             }
-         }
-     }
+         } // if (operation)
+     } // for (fi = 0; fi <= count ; fi++)

  
  // set a new syncKey if there are folder changes
@@ -1815,6 +1855,9 @@ void handle_eas_terminate(int signum)
                                           inContext: context
                                             acquire: NO];

+          if ([appointmentObject isKindOfClass: [NSException class]])
+            appointmentObject = [self _eventObjectWithUID:[event uid]];
+
          // Create the appointment if it is not added to calendar yet
          if ([appointmentObject isKindOfClass: [NSException class]])
            {
@@ -2383,6 +2426,11 @@ void handle_eas_terminate(int signum)
          realCollectionId = [collectionId realCollectionIdWithFolderType: &folderType];
          realCollectionId = [self globallyUniqueIDToIMAPFolderName: realCollectionId  type: folderType];

+          // We avoid loading the cache metadata if we can't get the real connection. This can happen
+          // for example if the IMAP server is down. We just skip the folder for now.
+          if (!realCollectionId)
+            continue;
+
          if (folderType == ActiveSyncMailFolder)
              folderMetadata = [self _folderMetadataForKey: [NSString stringWithFormat: @"folder%@", [[collectionId stringByUnescapingURL] substringFromIndex:5]]];
          else
@@ -2432,7 +2480,7 @@ void handle_eas_terminate(int signum)
                {
 		  int t;

-                  [self logWithFormat: @"Sleeping %d seconds while detecting changes in Ping...", internalInterval-total_sleep];
+                  [self logWithFormat: @"Sleeping %d seconds while detecting changes for user %@ in Ping...", internalInterval-total_sleep, [[context activeUser] login]];

 		  for (t = 0; t < sleepInterval; t++)
 		    {
@@ -2759,7 +2807,7 @@ void handle_eas_terminate(int signum)
              inResponse: (WOResponse *) theResponse
 {
  SOGoContactSourceFolder *currentFolder;
-  NSArray *allKeys, *allContacts, *mails;
+  NSArray *allKeys, *allContacts, *mails, *a;
  NSDictionary *systemSources, *contact;
  SOGoContactFolders *contactFolders;
  NSString *current_mail, *query;
@@ -2769,7 +2817,10 @@ void handle_eas_terminate(int signum)
  NSData *d;
  id o;

-  int i, j, total;
+  int i, j, t, v, total, minResult, maxResult, maxSize, maxPictures;
+  BOOL withPhoto;
+
+  withPhoto = NO;

  query = [[(id)[theDocumentElement getElementsByTagName: @"Query"] lastObject] textValue];

@@ -2778,6 +2829,33 @@ void handle_eas_terminate(int signum)
  systemSources = [contactFolders systemSources];
  allKeys = [systemSources allKeys];

+  // We check for the maximum number of results to return.
+  a = [[[(id)[theDocumentElement getElementsByTagName: @"Range"] lastObject] textValue] componentsSeparatedByString: @"-"];
+  minResult = [[a objectAtIndex: 0] intValue];
+  maxResult = [[a objectAtIndex: 1] intValue];
+
+  if (maxResult == 0)
+    maxResult = 99;
+
+  if ((o = [(id)[[(id)[theDocumentElement getElementsByTagName: @"Options"] lastObject] getElementsByTagName: @"Picture"] lastObject]))
+    {
+      withPhoto = YES;
+
+      // We check for a MaxSize, default to 102400.
+      maxSize = [[[(id)[o getElementsByTagName: @"MaxSize"] lastObject] textValue] intValue];
+
+      // We check if we must overwrite the maxSize with a system preference. This can be useful
+      // if we don't want to have pictures in the response.
+      if ((v = [[SOGoSystemDefaults sharedSystemDefaults] maximumPictureSize]))
+        maxSize = v;
+
+      // We check for a MaxPictures, default to 99.
+      maxPictures = [[[(id)[o getElementsByTagName: @"MaxPictures"] lastObject] textValue] intValue];
+
+      if (maxPictures == 0)
+        maxPictures = 99;
+    }
+
  s = [NSMutableString string];

  [s appendString: @"<?xml version=\"1.0\" encoding=\"utf-8\"?>"];
@@ -2794,12 +2872,12 @@ void handle_eas_terminate(int signum)
    {
      currentFolder = [systemSources objectForKey: [allKeys objectAtIndex: i]];
      allContacts = [currentFolder lookupContactsWithFilter: query
-                                                 onCriteria: @"name_or_address"
+                                                 onCriteria: nil
                                                     sortBy: @"c_cn"
                                                   ordering: NSOrderedAscending
                                                   inDomain: [[context activeUser] domain]];

-      for (j = 0; j < [allContacts count]; j++)
+      for (j = minResult; (j < [allContacts count] && j < maxResult) ; j++)
        {          
          contact = [allContacts objectAtIndex: j];
          
@@ -2817,9 +2895,9 @@ void handle_eas_terminate(int signum)
          else
            mails = [NSArray arrayWithObjects: o ? o : @"", nil];

-          for (total = 0; total < [mails count]; total++)
+          for (t = 0; t < [mails count]; t++)
            {
-              current_mail = [mails objectAtIndex: total];
+              current_mail = [mails objectAtIndex: t];
              
              [s appendString: @"<Result xmlns=\"Search:\">"];
              [s appendString: @"<Properties>"];
@@ -2837,7 +2915,7 @@ void handle_eas_terminate(int signum)
                [s appendFormat: @"<LastName xmlns=\"Gal:\">%@</LastName>", [o activeSyncRepresentationInContext: context]];
              
              if ([current_mail length] > 0)
-                [s appendFormat: @"<EmailAddress xmlns=\"Gal:\">%@</EmailAddress>", current_mail];
+                [s appendFormat: @"<EmailAddress xmlns=\"Gal:\">%@</EmailAddress>", [current_mail activeSyncRepresentationInContext: context]];
              
              if ((o = [contact objectForKey: @"telephonenumber"]))
                [s appendFormat: @"<Phone xmlns=\"Gal:\">%@</Phone>", [o activeSyncRepresentationInContext: context]];
@@ -2850,9 +2928,27 @@ void handle_eas_terminate(int signum)
              
              if ((o = [contact objectForKey: @"o"]))
                [s appendFormat: @"<Company xmlns=\"Gal:\">%@</Company>", [o activeSyncRepresentationInContext: context]];
-              
+
+              if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 14.1 && withPhoto)
+                {
+                  o = [contact objectForKey: @"photo"];
+                  if (o && [o length] <= maxSize && total < maxPictures)
+                    {
+                      [s appendString: @"<Picture xmlns=\"Gal:\"><Status>1</Status><Data>"];
+                      [s appendString: [o activeSyncRepresentationInContext: context]];
+                      [s appendString: @"</Data></Picture>"];
+                    }
+                  else if (!o)
+                    [s appendString: @"<Picture xmlns=\"Gal:\"><Status>173</Status></Picture>"];
+                  else if ([o length] > maxSize)
+                    [s appendString: @"<Picture xmlns=\"Gal:\"><Status>174</Status></Picture>"];
+                  else if (total >= maxPictures)
+                    [s appendString: @"<Picture xmlns=\"Gal:\"><Status>175</Status></Picture>"];
+                }
+
              [s appendString: @"</Properties>"];
              [s appendString: @"</Result>"];
+              total++;
            }
        }        
    }
@@ -2945,7 +3041,7 @@ void handle_eas_terminate(int signum)
 - (void) processSearchMailbox: (id <DOMElement>) theDocumentElement
 		   inResponse: (WOResponse *) theResponse
 {
-  NSString *folderId, *realCollectionId, *itemId;
+  NSString *folderId, *realCollectionId, *itemId, *bodyPreferenceType, *mimeSupport;
  NSMutableArray *folderIdentifiers;
  SOGoMailAccounts *accountsFolder;
  SOGoMailAccount *accountFolder;
@@ -2969,6 +3065,13 @@ void handle_eas_terminate(int signum)
      return;
    }

+  bodyPreferenceType = [[(id)[[(id)[theDocumentElement getElementsByTagName: @"BodyPreference"] lastObject] getElementsByTagName: @"Type"] lastObject] textValue];
+  [context setObject: bodyPreferenceType  forKey: @"BodyPreferenceType"];
+  mimeSupport = [[(id)[theDocumentElement getElementsByTagName: @"MIMESupport"] lastObject] textValue];
+  [context setObject: mimeSupport  forKey: @"MIMESupport"];
+
+  [context setObject: @"8" forKey: @"MIMETruncation"];
+
  // FIXME: support more than one CollectionId tag + DeepTraversal
  folderId = [[(id)[[(id)[theDocumentElement getElementsByTagName: @"Query"] lastObject] getElementsByTagName: @"CollectionId"] lastObject] textValue];
  folderIdentifiers = [NSMutableArray array];
@@ -3541,10 +3644,14 @@ void handle_eas_terminate(int signum)
 {
  NSString *folderId, *itemId, *realCollectionId;
  SOGoMicrosoftActiveSyncFolderType folderType;
+  SOGoMailAccounts *accountsFolder;
+  SOGoMailFolder *currentFolder;
+  SOGoUserFolder *userFolder;
+  SOGoMailObject *mailObject;
  SOGoUserDefaults *ud;

  BOOL htmlComposition, isHTML;
-  id value;
+  id value, currentCollection;
  
  isHTML = NO;
  ud = [[context activeUser] userDefaults];
@@ -3570,23 +3677,31 @@ void handle_eas_terminate(int signum)

  value = [theDocumentElement getElementsByTagName: @"ReplaceMime"];

+  // We fetch the mail object from the server
+  userFolder = [[context activeUser] homeFolderInContext: context];
+  accountsFolder = [userFolder lookupName: @"Mail"  inContext: context  acquire: NO];
+  currentFolder = [accountsFolder lookupName: @"0"  inContext: context  acquire: NO];
+
+  currentCollection = [currentFolder lookupName: [NSString stringWithFormat: @"folder%@", realCollectionId]
+				      inContext: context
+					acquire: NO];
+
+  mailObject = [currentCollection lookupName: itemId  inContext: context  acquire: NO];
+
  // ReplaceMime IS specified so we must NOT use the server copy
  // but rather take the data as-is from the client.
  if ([value count])
    {
-      [self processSendMail: theDocumentElement
-                 inResponse: theResponse];
+      [self processSendMail: theDocumentElement  inResponse: theResponse];
+      if (!isSmartForward)
+	[mailObject addFlags: @"Answered"];
+      else
+	[mailObject addFlags: @"$Forwarded"];
      return;
    }
  
  if (folderType == ActiveSyncMailFolder)
    {
-      SOGoMailAccounts *accountsFolder;
-      SOGoMailFolder *currentFolder;
-      SOGoUserFolder *userFolder;
-      SOGoMailObject *mailObject;
-      id currentCollection;
-
      NGMimeMessage *messageFromSmartForward, *messageToSend;
      NGMimeMessageParser *parser;
      NSData *data;
@@ -3605,16 +3720,6 @@ void handle_eas_terminate(int signum)

      int a;

-      userFolder = [[context activeUser] homeFolderInContext: context];
-      accountsFolder = [userFolder lookupName: @"Mail"  inContext: context  acquire: NO];
-      currentFolder = [accountsFolder lookupName: @"0"  inContext: context  acquire: NO];
-      
-      currentCollection = [currentFolder lookupName: [NSString stringWithFormat: @"folder%@", realCollectionId]
-                                          inContext: context
-                                            acquire: NO];
-
-      mailObject = [currentCollection lookupName: itemId  inContext: context  acquire: NO];
-
      parser = [[NGMimeMessageParser alloc] init];
      data = [[[[(id)[theDocumentElement getElementsByTagName: @"MIME"] lastObject] textValue] stringByDecodingBase64] dataUsingEncoding: NSUTF8StringEncoding];
      messageFromSmartForward = [parser parsePartFromData: data];
@@ -42,6 +42,9 @@ 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
+                inBuffer: (NSMutableString *) theBuffer
+               inContext: (WOContext *) _context;

@end

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

 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
@@ -44,9 +45,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSString+Encoding.h>
+#import <NGExtensions/NGHashMap.h>
 #import <NGImap4/NGImap4Envelope.h>
 #import <NGImap4/NGImap4EnvelopeAddress.h>
 #import <NGImap4/NSString+Imap4.h>
+#import <NGImap4/NGImap4Connection.h>
+#import <NGImap4/NGImap4Client.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WORequest.h>
@@ -60,6 +64,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <NGMail/NGMimeMessageGenerator.h>

 #import <SOGo/SOGoUserDefaults.h>
+#import <SOGo/SOGoUserFolder.h>
+#import <SOGo/NSArray+Utilities.h>

 #include "iCalTimeZone+ActiveSync.h"
 #include "NSData+ActiveSync.h"
@@ -71,6 +77,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <Mailer/SOGoMailBodyPart.h>
 #include <Mailer/NSString+Mail.h>

+#import <Mailer/SOGoMailLabel.h>
+#import <Mailer/SOGoMailFolder.h>
+#import <Mailer/SOGoMailObject.h>
+#import <Mailer/SOGoMailAccount.h>
+#import <Mailer/SOGoMailAccounts.h>
+
 #include <SOGo/SOGoUser.h>
 #include <SOGo/NSString+Utilities.h>

@@ -972,7 +984,12 @@ struct GlobalObjectId {

      // Location
      if ([[event location] length])
-        [s appendFormat: @"<Location xmlns=\"Email:\">%@</Location>", [[event location] activeSyncRepresentationInContext: context]];
+        {
+          if ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 16.0)
+            [s appendFormat: @"<Location xmlns=\"AirSyncBase:\"><DisplayName>%@</DisplayName></Location>", [[event location] activeSyncRepresentationInContext: context]];
+          else
+            [s appendFormat: @"<Location xmlns=\"Email:\">%@</Location>", [[event location] activeSyncRepresentationInContext: context]];
+        }

      [s appendFormat: @"<Organizer xmlns=\"Email:\">%@</Organizer>", [[[event organizer] mailAddress] activeSyncRepresentationInContext: context]];

@@ -1432,4 +1449,239 @@ struct GlobalObjectId {
    }
 }

+- (NSString *) storeMail: (NSDictionary *) theValues
+                inBuffer: (NSMutableString *) theBuffer
+               inContext: (WOContext *) _context
+{
+  NSString *dateReceived, *folder, *s, *serverId, *messageId;
+  NGMimeMessageGenerator *generator;
+  NGMimeMessage *draftMessage;
+  NGMimeBodyPart *bodyPart;
+  NGMimeMultipartBody *body;
+  NSDictionary *identity;
+  NGMutableHashMap *map;
+  NGImap4Client *client;
+  NSData *message_data;
+  NSArray *attachmentKeys;
+
+  id o, a, result, attachments;
+  int bodyType, i;
+
+  identity = [[context activeUser] primaryIdentity];
+  message_data = nil;
+  bodyType = 1;
+
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Type"]))
+    bodyType = [o intValue];
+
+  if (bodyType == 4)
+    {
+      s = [[theValues objectForKey: @"Body"] objectForKey: @"Data"];
+      message_data = [s dataUsingEncoding: NSUTF8StringEncoding];
+    }
+
+  if (bodyType == 1 || bodyType == 2)
+    {
+      map = [[[NGMutableHashMap alloc] initWithCapacity: 1] autorelease];
+
+      [map setObject: [NSString stringWithFormat: @"%@ <%@>", [identity objectForKey: @"fullName"], [identity objectForKey: @"email"]]  forKey: @"from"];
+
+      if ((o = [theValues objectForKey: @"To"]))
+          [map setObject: o  forKey: @"to"];
+
+      if ((o = [theValues objectForKey: @"Cc"]))
+          [map setObject: o  forKey: @"cc"];
+
+      if ((o = [theValues objectForKey: @"Bcc"]))
+          [map setObject: o  forKey: @"bcc"];
+
+      if ((o = [theValues objectForKey: @"Reply-To"]))
+          [map setObject: o  forKey: @"Reply-To"];
+
+      if ((o = [theValues objectForKey: @"Subject"]))
+          [map setObject: o  forKey: @"subject"];
+
+      o = [[theValues objectForKey: @"DateReceived"] calendarDate];
+
+      if (!o)
+        o = [NSCalendarDate date];
+
+#if GNUSTEP_BASE_MINOR_VERSION < 21
+      dateReceived = [o descriptionWithCalendarFormat: @"%a, %d %b %Y %H:%M:%S %z"
+                                             timeZone: [NSTimeZone timeZoneWithName: @"GMT"]
+                                               locale: nil];
+#else
+      dateReceived = [o descriptionWithCalendarFormat: @"%a, %d %b %Y %H:%M:%S %z"
+                                             timeZone: [NSTimeZone timeZoneWithName: @"GMT"]
+                                               locale: [NSDictionary dictionaryWithObjectsAndKeys:
+                                                                        [NSArray arrayWithObjects: @"Jan", @"Feb", @"Mar", @"Apr",
+                                                                                 @"May", @"Jun", @"Jul", @"Aug",
+                                                                                 @"Sep", @"Oct", @"Nov", @"Dec", nil],
+                                                                     @"NSShortMonthNameArray",
+                                                                        [NSArray arrayWithObjects: @"Sun", @"Mon", @"Tue", @"Wed", @"Thu",
+                                                                                 @"Fri", @"Sat", nil],
+                                                                     @"NSShortWeekDayNameArray",
+                                                                     nil]];
+#endif
+
+      [map setObject: dateReceived forKey: @"date"];
+
+      messageId = [NSString generateMessageID];
+      [map setObject: messageId forKey: @"message-id"];
+
+      attachmentKeys = [self fetchFileAttachmentKeys];
+
+      if ((attachments = [theValues objectForKey: @"Attachments"]) || [attachmentKeys count])
+        {
+          [map setObject: @"multipart/mixed" forKey: @"content-type"];
+          draftMessage = [[[NGMimeMessage alloc] initWithHeader: map] autorelease];
+          body = [[[NGMimeMultipartBody alloc] initWithPart: draftMessage] autorelease];
+
+          map = [[[NGMutableHashMap alloc] initWithCapacity: 1] autorelease];
+
+          [map setObject: (bodyType == 1 ? @"text/plain; charset=utf-8" : @"text/html; charset=utf-8")
+                  forKey: @"content-type"];
+          [map setObject: @"quoted-printable" forKey: @"content-transfer-encoding"];
+
+          bodyPart = [[[NGMimeBodyPart alloc] initWithHeader:map] autorelease];
+
+          [bodyPart setBody: [[NSString stringWithFormat: @"%@", [[theValues objectForKey: @"Body"] objectForKey: @"Data"] ] dataUsingEncoding: NSUTF8StringEncoding]];
+
+          [body addBodyPart: bodyPart];
+
+           // Add attachments from the original mail - skip deletions
+           if ([attachmentKeys count])
+             {
+               id currentAttachment;
+               NGHashMap *response;
+               NSData *bodydata;
+               NSArray *paths;
+               NGMimeFileData *fdata;
+               int i, ii;
+               BOOL found;
+
+               paths = [attachmentKeys keysWithFormat: @"BODY[%{path}]"];
+               response = [[self fetchParts: paths] objectForKey: @"RawResponse"];
+
+               for (i = 0; i < [attachmentKeys count]; i++)
+                 {
+                   currentAttachment = [attachmentKeys objectAtIndex: i];
+                   found = NO;
+                   for (ii = 0; ii < [attachments count]; ii++)
+                     {
+                       // no ClientId means its a deletio
+                       if (![[attachments objectAtIndex: ii] objectForKey: @"ClientId"] &&
+                           [[[[attachments objectAtIndex: ii] objectForKey: @"FileReference"] lastPathComponent] isEqualToString: [currentAttachment objectForKey: @"path"]])
+                         {
+                           found = YES;
+                           break;
+                         }
+                      }
+
+                   // skip deletions
+                   if (found)
+                     continue;
+
+                   bodydata = [[[response objectForKey: @"fetch"] objectForKey: [NSString stringWithFormat: @"body[%@]", [currentAttachment objectForKey: @"path"]]] valueForKey: @"data"];
+
+                   map = [[[NGMutableHashMap alloc] initWithCapacity: 1] autorelease];
+                   [map setObject: [currentAttachment objectForKey: @"mimetype"] forKey: @"content-type"];
+                   [map setObject: [currentAttachment objectForKey: @"encoding"] forKey: @"content-transfer-encoding"];
+                   [map addObject: [NSString stringWithFormat: @"attachment; filename=\"%@\"", [currentAttachment objectForKey: @"filename"]] forKey: @"content-disposition"];
+                   bodyPart = [[[NGMimeBodyPart alloc] initWithHeader: map] autorelease];
+
+                   fdata = [[NGMimeFileData alloc] initWithBytes:[bodydata bytes]  length:[bodydata length]];
+                   [bodyPart setBody: fdata];
+                   RELEASE(fdata);
+                   [body addBodyPart: bodyPart];
+                 }
+              }
+
+          // add new attachments
+          for (i = 0; i < [attachments count]; i++)
+            {
+
+               map = [[[NGMutableHashMap alloc] initWithCapacity: 1] autorelease];
+               a = [attachments objectAtIndex: i];
+
+               // no ClientId means its a deletion
+               if (![a objectForKey: @"ClientId"])
+                 continue;
+
+               [map setObject: @"application/octet-stream" forKey: @"content-type"]; // FIXME ?? can we guess the right content-type
+               [map setObject: @"base64" forKey: @"content-transfer-encoding"];
+               [map setObject: [NSString stringWithFormat: @"attachment; filename=\"%@\"", [a objectForKey: @"DisplayName"]] forKey: @"content-disposition"];
+
+               bodyPart = [[[NGMimeBodyPart alloc] initWithHeader:map] autorelease];
+               [bodyPart setBody: [[a objectForKey: @"Content"] stringByDecodingBase64]];
+               [body addBodyPart: bodyPart];
+            }
+
+
+          [draftMessage setBody: body];
+        }
+      else
+        {
+          [map setObject: (bodyType == 1 ? @"text/plain; charset=utf-8" : @"text/html; charset=utf-8")
+                  forKey: @"content-type"];
+          [map setObject: @"quoted-printable" forKey: @"content-transfer-encoding"];
+
+          draftMessage = [[[NGMimeMessage alloc] initWithHeader: map] autorelease];
+
+          [draftMessage setBody: [[NSString stringWithFormat: @"%@", [[theValues objectForKey: @"Body"] objectForKey: @"Data"] ] dataUsingEncoding: NSUTF8StringEncoding]];
+        }
+
+      generator = [[[NGMimeMessageGenerator alloc] init] autorelease];
+      message_data = [generator generateMimeFromPart: draftMessage];
+    }
+
+  if (message_data)
+    {
+      client = [[self imap4Connection] client];
+
+      if (![imap4 doesMailboxExistAtURL: [container imap4URL]])
+        {
+          [[self imap4Connection] createMailbox: [[self imap4Connection] imap4FolderNameForURL: [container imap4URL]]
+                                          atURL: [[self mailAccountFolder] imap4URL]];
+          [imap4 flushFolderHierarchyCache];
+        }
+
+      folder = [imap4 imap4FolderNameForURL: [container imap4URL]];
+
+      result = [client append: message_data
+                     toFolder: folder
+                    withFlags: [NSArray arrayWithObjects: @"draft", nil]];
+
+      serverId = [NSString stringWithFormat: @"%d", [self IMAP4IDFromAppendResult: result]];
+
+      [theBuffer appendString: @"<ApplicationData>"];
+      [theBuffer appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[messageId dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
+
+      if ([attachments count])
+        {
+          [theBuffer appendString: @"<Attachments xmlns=\"AirSyncBase:\">"];
+
+          for (i = 0; i < [attachments count]; i++)
+            {
+              a = [attachments objectAtIndex: i];
+
+              [theBuffer appendString: @"<Attachment>"];
+              [theBuffer appendFormat: @"<ClientId xmlns=\"AirSyncBase:\">%@</ClientId>", [a objectForKey: @"ClientId"]];
+              [theBuffer appendFormat: @"<FileReference xmlns=\"AirSyncBase:\">mail/%@/%@/%d</FileReference>", [[[self container] relativeImap4Name] stringByEscapingURL], serverId, i+2];
+              [theBuffer appendString: @"</Attachment>"];
+            }
+
+            [theBuffer appendString: @"</Attachments>"];
+          }
+
+      [theBuffer appendString: @"</ApplicationData>"];
+
+      if ([[result objectForKey: @"result"] boolValue])
+        return serverId;
+    }
+
+  return nil;
+}
+
+
@end
@@ -45,27 +45,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
 {
  NSMutableString *s;
+  NSCalendarDate *nextAlarmDate;
+  NSInteger delta;

  s = [NSMutableString string];
+
+  nextAlarmDate = [self nextAlarmDate];
+  delta = (int)(([[(iCalEvent *)parent startDate] timeIntervalSince1970] - [nextAlarmDate timeIntervalSince1970])/60);
  
-  if ([[self action] caseInsensitiveCompare: @"DISPLAY"] == NSOrderedSame)
+  if ([parent isKindOfClass: [iCalEvent class]])
    {
-      NSCalendarDate *nextAlarmDate;
-      NSInteger delta;
-      
-      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>", (int)delta];
+    }
+  else
+    {
+      [s appendFormat: @"<ReminderTime xmlns=\"Task:\">%@</ReminderTime>", [nextAlarmDate activeSyncRepresentationInContext: context]];
    }
  
  return s;
@@ -86,7 +82,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      trigger = [iCalTrigger elementWithTag: @"TRIGGER"];
      [trigger setValueType: @"DURATION"];
      [self setTrigger: trigger];
-      [self setAction: @"DISPLAY"];
+      if (![[self action] length])
+        [self setAction: @"DISPLAY"];

      // SOGo web ui only supports 1w but not 2w (custom reminder only supports min/hours/days)
      // 1week = -P1W
@@ -115,8 +112,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      trigger = [iCalTrigger elementWithTag: @"TRIGGER"];
      [trigger setValueType: @"DATE-TIME"];
      [trigger setSingleValue: [NSString stringWithFormat: @"%@Z", [o iCalFormattedDateTimeString]] forKey: @""];
+
+      if  ((o = [theValues objectForKey: @"ReminderSet"]))
+        {
+          if ([o intValue] == 0)
+             [trigger setValue: 0 ofAttribute: @"x-webstatus" to: @"triggered"];
+        }
+
      [self setTrigger: trigger];
-      [self setAction: @"DISPLAY"];
+      if (![[self action] length])
+        [self setAction: @"DISPLAY"];
    }
 }

@@ -128,7 +128,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
  if ([self startDate])
    {
-      if ([self isAllDay] && !tz)
+      if ([self isAllDay] && !tz && [[context objectForKey: @"ASProtocolVersion"] floatValue] < 16.0)
        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>",
           [[[self startDate] dateByAddingYears: 0 months: 0 days: 0
                                          hours: 0 minutes: 0
@@ -141,7 +141,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] && !tz && [[context objectForKey: @"ASProtocolVersion"] floatValue] < 16.0)
        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>",
           [[[self endDate] dateByAddingYears: 0 months: 0 days: 0
                                        hours: 0 minutes: 0
@@ -231,9 +231,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    }
  else
    {
-      // If it's a normal event (ie, with no organizer/attendee) or we are the organizer to an event
-      // invitation, we set the busy status to 2 (Busy)
-      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>", 2];
+      // 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: @"<MeetingStatus xmlns=\"Calendar:\">%d</MeetingStatus>", meetingStatus];
@@ -244,7 +244,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  // Location
  if ([[self location] length])
-    [s appendFormat: @"<Location xmlns=\"Calendar:\">%@</Location>", [[self location] activeSyncRepresentationInContext: context]];
+    {
+      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]];
+    }
  
  // Importance - NOT SUPPORTED - DO NOT ENABLE
  //o = [self priority];
@@ -316,7 +321,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    {
      iCalAlarm *alarm;
      
-      alarm = [self firstDisplayOrAudioAlarm];
+      alarm = [self firstSupportedAlarm];
      [s appendString: [alarm activeSyncRepresentationInContext: context]];
    }

@@ -442,6 +447,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  NSCalendarDate *oldstart;
  NSTimeZone *userTimeZone;
  iCalTimeZone *tz;
+  iCalAlarm *alarm;
  id o;
  int deltasecs;

@@ -451,7 +457,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  occurences = [NSMutableArray arrayWithArray: [[self parent] events]];

-  if ((o = [theValues objectForKey: @"UID"]))
+  if ((o = [theValues objectForKey: ([[context objectForKey: @"ASProtocolVersion"] floatValue] >= 16.0) ? @"ClientUid" : @"UID"]))
    [self setUid: o];
    
  // FIXME: merge with iCalToDo
@@ -474,7 +480,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  //
  if ((o = [theValues objectForKey: @"BusyStatus"]))
    {
-      [o intValue];
+      if ([o boolValue])
+        [self setTransparency: @"OPAQUE"];
+      else
+        [self setTransparency: @"TRANSPARENT"];
    }

  //
@@ -527,8 +536,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        [self setComment: o];
    }

-  if ((o = [theValues objectForKey: @"Location"]))
+  if ([[context objectForKey: @"ASProtocolVersion"] floatValue] < 16.0 && (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;
@@ -572,23 +583,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        }
    }

-  //
-  // If an alarm is deinfed with an action != DISPLAY, we ignore the alarm - don't want to overwrite. 
-  //
-  if ([self hasAlarms] && [[[[self alarms] objectAtIndex: 0] action] caseInsensitiveCompare: @"DISPLAY"] != NSOrderedSame)
-    {
-      // Ignore the alarm for now
-    }
-  else if ((o = [theValues objectForKey: @"Reminder"]))
+  if ((o = [theValues objectForKey: @"Reminder"]) && [o length])
    {           
+      if ([self hasAlarms])
+        alarm = [[self firstSupportedAlarm] mutableCopy];
+      else
+        alarm = [[iCalAlarm alloc] init];
+
      // 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)
      //
      // http://answers.microsoft.com/en-us/office/forum/office_2013_release-outlook/desktop-outlook-calendar-creates-entries-with/9aef72d8-81bb-4a32-a6ab-bf7d216fb811?page=5&tm=1395690285088 
      //
-      iCalAlarm *alarm;
      
-      alarm = [[iCalAlarm alloc] init];
      [alarm takeActiveSyncValues: theValues  inContext: context];

      [self removeAllAlarms];
@@ -830,7 +837,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        }
    }
  
-
  // 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]])
@@ -852,10 +858,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
              // { "Attendee_Email" = "sogo3@example.com"; "Attendee_Name" = "Wolfgang Fritz"; "Attendee_Status" = 5; "Attendee_Type" = 1; }
              attendee = [o objectAtIndex: i];
              
+              if ([self isOrganizer: [attendee objectForKey: @"Attendee_Email"]])
+                continue;
+
              person = [iCalPerson elementWithTag: @"attendee"];
              [person setCn: [attendee objectForKey: @"Attendee_Name"]];
              [person setEmail: [attendee objectForKey: @"Attendee_Email"]];
-              
+
              status = [[attendee objectForKey: @"Attendee_Status"] intValue];
              
              switch (status)
@@ -872,7 +881,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                case 0:
                case 5:
                default:
-                  [person setPartStat: @"NEEDS-ACTION"];
+		  {
+		    [person setPartStat: @"NEEDS-ACTION"];
+		    [person setRsvp: @"TRUE"];
+		  }
                  break;
                }
              
@@ -102,10 +102,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  if ([self hasAlarms])
    {
      iCalAlarm *alarm;
+      NSString *webstatus;

-      alarm = [self firstDisplayOrAudioAlarm];
-      [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 1];
-      [s appendString: [alarm activeSyncRepresentationInContext: context]];
+      if ((alarm = [self firstSupportedAlarm]))
+        {
+          webstatus = [[alarm trigger] value: 0 ofAttribute: @"x-webstatus"];
+          if (!webstatus || ([webstatus caseInsensitiveCompare: @"TRIGGERED"] != NSOrderedSame))
+            [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 1];
+          else
+            [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 0];
+
+          [s appendString: [alarm activeSyncRepresentationInContext: context]];
+        }
+      else
+        {
+          [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 0];
+        }
    }
  else
    {
@@ -57,6 +57,9 @@ ProxyPreserveHost On
 #   Allow from your-cas-host-addr
 # </Proxy>

+# Redirect / to /SOGo
+#RedirectMatch ^/$ https://mail.yourdomain.com/SOGo
+
 # 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.
@@ -68,10 +71,11 @@ ProxyPreserveHost On
 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
+## Adjust the following to your configuration
+## and make sure to enable the headers module
 <IfModule headers_module>
  RequestHeader set "x-webobjects-server-port" "443"
+  SetEnvIf Host (.*) HTTP_HOST=$1
  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