Merge to 2.2.4

Update ChangeLog
Preparation for release 2.2.4
2014-05-29 11:17:46 -04:00 · 2014-05-29 11:16:59 -04:00 · 2014-05-29 11:16:40 -04:00 · 2014-05-29 11:15:13 -04:00 · 2014-05-29 11:14:23 -04:00 · 2014-05-29 10:50:48 -04:00
782 changed files with 42150 additions and 22765 deletions
@@ -1,6 +1,8 @@
 config.make
 tags
+*._*
 */obj/
+*._*
 */*/obj/
 */*/*/obj/
 */*/*.SOGo/
@@ -9,3 +11,6 @@ tags
 *.swp
 SoObjects/SOGo/SOGo.framework/
 SoObjects/SOGo/derived_src/
+Tests/*/config.py
+*.pyc
+._*
@@ -1,9 +1,10 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com

 [sogo.ui-mailerui]
 source_file = UI/MailerUI/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/MailerUI/Arabic.lproj/Localizable.strings
 trans.ca = UI/MailerUI/Catalan.lproj/Localizable.strings
 trans.cs = UI/MailerUI/Czech.lproj/Localizable.strings
 trans.cy = UI/MailerUI/Welsh.lproj/Localizable.strings
@@ -29,6 +30,7 @@ trans.uk = UI/MailerUI/Ukrainian.lproj/Localizable.strings
 [sogo.ui-preferencesui]
 source_file = UI/PreferencesUI/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/PreferencesUI/Arabic.lproj/Localizable.strings
 trans.ca = UI/PreferencesUI/Catalan.lproj/Localizable.strings
 trans.cs = UI/PreferencesUI/Czech.lproj/Localizable.strings
 trans.cy = UI/PreferencesUI/Welsh.lproj/Localizable.strings
@@ -54,6 +56,7 @@ trans.uk = UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
 [sogo.ui-scheduler]
 source_file = UI/Scheduler/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/Scheduler/Arabic.lproj/Localizable.strings
 trans.ca = UI/Scheduler/Catalan.lproj/Localizable.strings
 trans.cs = UI/Scheduler/Czech.lproj/Localizable.strings
 trans.cy = UI/Scheduler/Welsh.lproj/Localizable.strings
@@ -79,6 +82,7 @@ trans.uk = UI/Scheduler/Ukrainian.lproj/Localizable.strings
 [sogo.ui-contacts]
 source_file = UI/Contacts/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/Contacts/Arabic.lproj/Localizable.strings
 trans.ca = UI/Contacts/Catalan.lproj/Localizable.strings
 trans.cs = UI/Contacts/Czech.lproj/Localizable.strings
 trans.cy = UI/Contacts/Welsh.lproj/Localizable.strings
@@ -104,6 +108,7 @@ trans.uk = UI/Contacts/Ukrainian.lproj/Localizable.strings
 [sogo.ui-mainui]
 source_file = UI/MainUI/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/MainUI/Arabic.lproj/Localizable.strings
 trans.ca = UI/MainUI/Catalan.lproj/Localizable.strings
 trans.cs = UI/MainUI/Czech.lproj/Localizable.strings
 trans.cy = UI/MainUI/Welsh.lproj/Localizable.strings
@@ -129,6 +134,7 @@ trans.uk = UI/MainUI/Ukrainian.lproj/Localizable.strings
 [sogo.ui-common]
 source_file = UI/Common/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/Common/Arabic.lproj/Localizable.strings
 trans.ca = UI/Common/Catalan.lproj/Localizable.strings
 trans.cs = UI/Common/Czech.lproj/Localizable.strings
 trans.cy = UI/Common/Welsh.lproj/Localizable.strings
@@ -154,6 +160,7 @@ trans.uk = UI/Common/Ukrainian.lproj/Localizable.strings
 [sogo.ui-administrationui]
 source_file = UI/AdministrationUI/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/AdministrationUI/Arabic.lproj/Localizable.strings
 trans.ca = UI/AdministrationUI/Catalan.lproj/Localizable.strings
 trans.cs = UI/AdministrationUI/Czech.lproj/Localizable.strings
 trans.cy = UI/AdministrationUI/Welsh.lproj/Localizable.strings
@@ -179,6 +186,7 @@ trans.uk = UI/AdministrationUI/Ukrainian.lproj/Localizable.strings
 [sogo.soobjects-appointments]
 source_file = SoObjects/Appointments/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = SoObjects/Appointments/Arabic.lproj/Localizable.strings
 trans.ca = SoObjects/Appointments/Catalan.lproj/Localizable.strings
 trans.cs = SoObjects/Appointments/Czech.lproj/Localizable.strings
 trans.cy = SoObjects/Appointments/Welsh.lproj/Localizable.strings
@@ -204,6 +212,7 @@ trans.uk = SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
 [sogo.soobjects-contacts]
 source_file = SoObjects/Contacts/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = SoObjects/Contacts/Arabic.lproj/Localizable.strings
 trans.ca = SoObjects/Contacts/Catalan.lproj/Localizable.strings
 trans.cs = SoObjects/Contacts/Czech.lproj/Localizable.strings
 trans.cy = SoObjects/Contacts/Welsh.lproj/Localizable.strings
@@ -226,9 +235,36 @@ trans.sk = SoObjects/Contacts/Slovak.lproj/Localizable.strings
 trans.sv = SoObjects/Contacts/Swedish.lproj/Localizable.strings
 trans.uk = SoObjects/Contacts/Ukrainian.lproj/Localizable.strings

+[sogo.soobjects-mailer]
+source_file = SoObjects/Mailer/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = SoObjects/Mailer/Arabic.lproj/Localizable.strings
+trans.ca = SoObjects/Mailer/Catalan.lproj/Localizable.strings
+trans.cs = SoObjects/Mailer/Czech.lproj/Localizable.strings
+trans.cy = SoObjects/Mailer/Welsh.lproj/Localizable.strings
+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.fi = SoObjects/Mailer/Finnish.lproj/Localizable.strings
+trans.fr = SoObjects/Mailer/French.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.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_BR = SoObjects/Mailer/BrazilianPortuguese.lproj/Localizable.strings
+trans.ru = SoObjects/Mailer/Russian.lproj/Localizable.strings
+trans.sk = SoObjects/Mailer/Slovak.lproj/Localizable.strings
+trans.sv = SoObjects/Mailer/Swedish.lproj/Localizable.strings
+trans.uk = SoObjects/Mailer/Ukrainian.lproj/Localizable.strings
+
 [sogo.ui-mailpartviewers]
 source_file = UI/MailPartViewers/English.lproj/Localizable.strings
 source_lang = en
+trans.ar = UI/MailPartViewers/Arabic.lproj/Localizable.strings
 trans.ca = UI/MailPartViewers/Catalan.lproj/Localizable.strings
 trans.cs = UI/MailPartViewers/Czech.lproj/Localizable.strings
 trans.cy = UI/MailPartViewers/Welsh.lproj/Localizable.strings
@@ -0,0 +1,40 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#import <Foundation/NSObject.h>
+
+@interface ActiveSyncProduct : NSObject
+{
+}
+
+@end
+
+@implementation ActiveSyncProduct
+@end /* ActiveSyncProduct */
@@ -0,0 +1,42 @@
+
+# GNUstep makefile
+
+include common.make
+
+BUNDLE_NAME = ActiveSync
+
+ActiveSync_PRINCIPAL_CLASS = ActiveSyncProduct
+
+ActiveSync_OBJC_FILES =			\
+	ActiveSyncProduct.m		\
+	iCalAlarm+ActiveSync.m		\
+	iCalEvent+ActiveSync.m		\
+	iCalRecurrenceRule+ActiveSync.m \
+	iCalTimeZone+ActiveSync.m	\
+	iCalToDo+ActiveSync.m		\
+	NSCalendarDate+ActiveSync.m	\
+	NSData+ActiveSync.m		\
+	NSDate+ActiveSync.m		\
+	NGDOMElement+ActiveSync.m	\
+	NGMimeMessage+ActiveSync.m	\
+	NGVCard+ActiveSync.m		\
+	NSArray+SyncCache.m		\
+	NSString+ActiveSync.m		\
+	SOGoActiveSyncDispatcher.m	\
+	SOGoActiveSyncDispatcher+Sync.m \
+	SOGoMailObject+ActiveSync.m 	\
+	SOGoSyncCacheObject.m		\
+	SoObjectWebDAVDispatcher+ActiveSync.m
+
+ActiveSync_RESOURCE_FILES +=		\
+	product.plist
+
+ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations
+ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/
+ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/
+ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/
+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2
+
+-include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/bundle.make
+-include GNUmakefile.postamble
@@ -0,0 +1 @@
+# compilation settings
@@ -0,0 +1,25 @@
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -0,0 +1,44 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NGDOMELEMENTACTIVESYNC_H__
+#define __NGDOMELEMENTACTIVESYNC_H__
+
+#import <DOM/DOMElement.h>
+#import <DOM/DOMProtocols.h>
+
+@class NSDictionary;
+
+@interface NGDOMElement (ActiveSync)
+
+- (NSDictionary *) applicationData;
+
+@end
+
+#endif // NGDOMELEMENTACTIVESYNC
@@ -0,0 +1,190 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#include "NGDOMElement+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+static NSArray *asElementArray = nil;
+
+@implementation NGDOMElement (ActiveSync)
+
+- (BOOL) isTextNode
+{
+  id <DOMNodeList> children;
+  id <DOMElement> element;
+  int i;
+
+  if ([self nodeType] == DOM_TEXT_NODE)
+    return YES;
+  
+  children = [self childNodes];
+
+  for (i = 0; i < [children length]; i++)
+    {
+      element = [children objectAtIndex: i];
+
+      if ([element nodeType] != DOM_TEXT_NODE)
+        return NO;
+    }
+  
+  return YES;
+}
+
+//
+// We must handle "inner data" like this:
+// 
+// <ApplicationData>
+//  <Flag xmlns="Email:">
+//   <FlagStatus>2</FlagStatus>
+//   <FlagType>Flag for follow up</FlagType>
+//  </Flag>
+// </ApplicationData>
+//
+// and stuff like that:
+//
+// <Attendees xmlns="Calendar:">
+//  <Attendee>
+//   <Attendee_Email>sogo1@example.com</Attendee_Email>
+//   <Attendee_Name>John Doe</Attendee_Name>
+//   <Attendee_Status>5</Attendee_Status>
+//   <Attendee_Type>1</Attendee_Type>
+//  </Attendee>
+//  <Attendee>
+//   <Attendee_Email>sogo2@example.com</Attendee_Email>
+//   <Attendee_Name>Balthazar César</Attendee_Name>
+//   <Attendee_Status>5</Attendee_Status>
+//   <Attendee_Type>1</Attendee_Type>
+//  </Attendee>
+//  <Attendee>
+//   <Attendee_Email>sogo3@example.com</Attendee_Email>
+//   <Attendee_Name>Wolfgang Fritz</Attendee_Name>
+//   <Attendee_Status>5</Attendee_Status>
+//   <Attendee_Type>1</Attendee_Type>
+//  </Attendee>
+// </Attendees>
+//
+
+- (NSDictionary *) applicationData
+{
+  NSMutableDictionary *data;
+  id <DOMNodeList> children;
+  id <DOMElement> element;
+  int i, count;
+  
+  if (!asElementArray)
+    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", nil];
+
+  data = [NSMutableDictionary dictionary];
+
+  children = [self childNodes];
+
+  for (i = 0; i < [children length]; i++)
+    {
+      element = [children objectAtIndex: i];
+
+      if ([element nodeType] == DOM_ELEMENT_NODE)
+        {
+          NSString *tag;
+          id value;
+          
+          tag = [element tagName];
+          count = [(NSArray *)[element childNodes] count];
+          
+          // We check if the node is a text one or if all its
+          // children are text nodes. This is important to avoid side-effects
+          // in SOPE where "foo & bar" would result into 3 childnodes instead
+          // of just one.
+          if ([(id)element isTextNode])
+            {
+              value = [(id)element textValue];
+            }
+          // Handle inner data - see above for samples
+          else
+            {
+              NSMutableArray *innerElements;
+              id <DOMElement> innerElement;
+              NSArray *childNodes;
+              NSString *innerTag;
+              BOOL same;
+              int j;
+              
+              childNodes = (NSArray *)[element childNodes];
+              innerElements = [NSMutableArray array];
+              innerTag = nil;
+              same = YES;
+
+              for (j = 1; j < count; j++)
+                {
+                  innerElement = [childNodes objectAtIndex: j];
+
+                  if ([innerElement nodeType] == DOM_ELEMENT_NODE)
+                    {
+                      if (!innerTag)
+                        innerTag = [innerElement tagName];
+
+                      if ([innerTag isEqualToString: [innerElement tagName]])
+                        {
+                          if ([(id)innerElement isTextNode])
+                            [innerElements addObject: [(NGDOMElement *)innerElement textValue]];
+                          else
+                            [innerElements addObject: [(NGDOMElement *)innerElement applicationData]];
+                        }
+                      else
+                        {
+                          same = NO;
+                          break;
+                        }
+                    }
+                }
+
+              if (same && [asElementArray containsObject: innerTag])
+                value = innerElements;
+              else
+                {
+                  value = [(NGDOMElement *)element applicationData];
+                  
+                  // Don't set empty values like Foo = {}
+                  if (![value count])
+                    value = nil;
+                }
+            }
+          
+          if (value && tag)
+            [data setObject: value  forKey: tag];
+          
+        } // if ([element nodeType] == DOM_ELEMENT_NODE)
+    }
+  
+  return data;
+}
+
+@end
@@ -0,0 +1,43 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NGMIMEMESSAGEACTIVESYNC_H__
+#define __NGMIMEMESSAGEACTIVESYNC_H__
+
+#import <NGMail/NGMimeMessage.h>
+
+@class NSArray;
+
+@interface NGMimeMessage (ActiveSync)
+
+- (NSArray *) allRecipients;
+
+@end
+
+#endif
@@ -0,0 +1,62 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NGMimeMessage+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
+#import <SOGo/NSString+Utilities.h>
+
+@implementation NGMimeMessage (ActiveSync)
+
+- (NSArray *) allRecipients
+{
+  NSMutableArray *recipients;
+  NSEnumerator *enumerator;
+  NSString *s;
+
+  recipients = [NSMutableArray array];
+
+  enumerator = [[self headersForKey: @"to"] objectEnumerator];
+  while ((s = [enumerator nextObject]))
+    {
+      [recipients addObject: [s pureEMailAddress]];
+    }
+
+  enumerator = [[self headersForKey: @"cc"] objectEnumerator];
+  while ((s = [enumerator nextObject]))
+    {
+      [recipients addObject: [s pureEMailAddress]];
+    }
+
+  return recipients;
+}
+@end
@@ -0,0 +1,47 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NGVCARDACTIVESYNC_H__
+#define __NGVCARDACTIVESYNC_H__
+
+#import <NGCards/NGVCard.h>
+
+@class NSDictionary;
+@class NSString;
+@class WOContext;
+
+@interface NGVCard (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,351 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NGVCard+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSString+misc.h>
+
+#import <NGCards/CardElement.h>
+
+#import <Contacts/NGVCard+SOGo.h>
+
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+@implementation NGVCard (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSArray *emails, *addresses, *categories, *elements;
+  CardElement *n, *homeAdr, *workAdr;
+  NSMutableString *s;
+  NSString *url;
+  id o;
+
+  int i;
+
+  s = [NSMutableString string];
+  n = [self n];
+  
+  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]];
+  
+  if ((o = [self workCompany]))
+    [s appendFormat: @"<CompanyName xmlns=\"Contacts:\">%@</CompanyName>", [o activeSyncRepresentationInContext: context]];
+
+  if ((o = [[self org] flattenedValueAtIndex: 1 forKey: @""]))
+    [s appendFormat: @"<Department xmlns=\"Contacts:\">%@</Department>", [o activeSyncRepresentationInContext: context]];
+
+  categories = [self categories];
+
+  if ([categories count])
+    {
+      [s appendFormat: @"<Categories xmlns=\"Contacts:\">"];
+      for (i = 0; i < [categories count]; i++)
+        {
+          [s appendFormat: @"<Category xmlns=\"Contacts:\">%@</Category>", [[categories objectAtIndex: i] activeSyncRepresentationInContext: context]];
+        }
+      [s appendFormat: @"</Categories>"];
+    }
+  
+  elements = [self childrenWithTag: @"url"
+                      andAttribute: @"type"
+                       havingValue: @"work"];
+  if ([elements count] > 0)
+    {
+      url = [[elements objectAtIndex: 0] flattenedValuesForKey: @""];
+      [s appendFormat: @"<WebPage xmlns=\"Contacts:\">%@</WebPage>", [url activeSyncRepresentationInContext: context]];
+    }
+  
+  
+  if ((o = [[self uniqueChildWithTag: @"x-aim"] flattenedValuesForKey: @""]))
+    [s appendFormat: @"<IMAddress xmlns=\"Contacts:\">%@</IMAddress>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self nickname]))
+    [s appendFormat: @"<NickName xmlns=\"Contacts:\">%@</NickName>", [o activeSyncRepresentationInContext: context]];
+  
+  
+  if ((o = [self title]))
+    [s appendFormat: @"<JobTitle xmlns=\"Contacts:\">%@</JobTitle>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self preferredEMail])) 
+    [s appendFormat: @"<Email1Address xmlns=\"Contacts:\">%@</Email1Address>", o];
+  
+  
+  // Secondary email addresses (2 and 3)
+  emails = [self secondaryEmails];
+
+  for (i = 0; i < [emails count]; i++)
+    {
+      o = [[emails objectAtIndex: i] flattenedValuesForKey: @""];
+      
+      [s appendFormat: @"<Email%dAddress xmlns=\"Contacts:\">%@</Email%dAddress>", i+2, o, i+2];
+
+      if (i == 1)
+        break;
+    }
+
+  // Telephone numbers
+  if ((o = [self workPhone]) && [o length])
+    [s appendFormat: @"<BusinessPhoneNumber xmlns=\"Contacts:\">%@</BusinessPhoneNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self homePhone]) && [o length])
+    [s appendFormat: @"<HomePhoneNumber xmlns=\"Contacts:\">%@</HomePhoneNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self fax]) && [o length])
+    [s appendFormat: @"<BusinessFaxNumber xmlns=\"Contacts:\">%@</BusinessFaxNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self mobile]) && [o length])
+    [s appendFormat: @"<MobilePhoneNumber xmlns=\"Contacts:\">%@</MobilePhoneNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self pager]) && [o length])
+    [s appendFormat: @"<PagerNumber xmlns=\"Contacts:\">%@</PagerNumber>", [o activeSyncRepresentationInContext: context]];
+
+  // Home Address
+  addresses = [self childrenWithTag: @"adr"
+                       andAttribute: @"type"
+                        havingValue: @"home"];
+  
+  if ([addresses count])
+    {
+      homeAdr = [addresses objectAtIndex: 0];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 2  forKey: @""]))
+        [s appendFormat: @"<HomeStreet xmlns=\"Contacts:\">%@</HomeStreet>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 3  forKey: @""]))
+        [s appendFormat: @"<HomeCity xmlns=\"Contacts:\">%@</HomeCity>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 4  forKey: @""]))
+        [s appendFormat: @"<HomeState xmlns=\"Contacts:\">%@</HomeState>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 5  forKey: @""]))
+        [s appendFormat: @"<HomePostalCode xmlns=\"Contacts:\">%@</HomePostalCode>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 6  forKey: @""]))
+        [s appendFormat: @"<HomeCountry xmlns=\"Contacts:\">%@</HomeCountry>", [o activeSyncRepresentationInContext: context]];
+    }
+  
+  // Work Address
+  addresses = [self childrenWithTag: @"adr"
+                       andAttribute: @"type"
+                        havingValue: @"work"];
+  
+  if ([addresses count])
+    {
+      workAdr = [addresses objectAtIndex: 0];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 2  forKey: @""]))
+        [s appendFormat: @"<BusinessStreet xmlns=\"Contacts:\">%@</BusinessStreet>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 3  forKey: @""]))
+        [s appendFormat: @"<BusinessCity xmlns=\"Contacts:\">%@</BusinessCity>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 4  forKey: @""]))
+        [s appendFormat: @"<BusinessState xmlns=\"Contacts:\">%@</BusinessState>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 5  forKey: @""]))
+        [s appendFormat: @"<BusinessPostalCode xmlns=\"Contacts:\">%@</BusinessPostalCode>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 6  forKey: @""]))
+        [s appendFormat: @"<BusinessCountry xmlns=\"Contacts:\">%@</BusinessCountry>", [o activeSyncRepresentationInContext: context]];
+    }
+
+  // Other, less important fields
+  if ((o = [self birthday]))
+    [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>", [o activeSyncRepresentationInContext: context]];
+
+  if ((o = [self note]))
+    {
+      o = [o activeSyncRepresentationInContext: context];
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1]; 
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Truncated>%d</Truncated>", 0];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
+    }
+  
+  return s;
+}
+
+//
+//
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  CardElement *element;
+  id o;
+  
+  // Contact's note
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setNote: o];
+
+  // Categories
+  if ((o = [theValues objectForKey: @"Categories"]))
+    [self setCategories: o];
+
+  // Birthday
+  if ((o = [theValues objectForKey: @"Birthday"]))
+    {
+      o = [o calendarDate];
+      [self setBday: [o descriptionWithCalendarFormat: @"%Y-%m-%d"]];
+    }
+
+  //
+  // Business address information
+  //
+  // BusinessStreet
+  // BusinessCity
+  // BusinessPostalCode
+  // BusinessState
+  // BusinessCountry
+  //
+  element = [self elementWithTag: @"adr" ofType: @"work"];
+  [element setSingleValue: @""
+                  atIndex: 1 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessStreet"]
+                  atIndex: 2 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessCity"]
+                  atIndex: 3 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessState"]
+                  atIndex: 4 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessPostalCode"]
+                  atIndex: 5 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessCountry"]
+                  atIndex: 6 forKey: @""];
+
+  //
+  // Home address information
+  //
+  // HomeStreet
+  // HomeCity
+  // HomePostalCode
+  // HomeState
+  // HomeCountry
+  //
+  element = [self elementWithTag: @"adr" ofType: @"home"];
+  [element setSingleValue: @""
+                  atIndex: 1 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeStreet"]
+                  atIndex: 2 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeCity"]
+                  atIndex: 3 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeState"]
+                  atIndex: 4 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomePostalCode"]
+                  atIndex: 5 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeCountry"]
+                  atIndex: 6 forKey: @""];
+
+  // Company's name
+  if ((o = [theValues objectForKey: @"CompanyName"]))
+    [self setOrg: o  units: nil];
+  
+  // Department
+  if ((o = [theValues objectForKey: @"Department"]))
+    [self setOrg: nil  units: [NSArray arrayWithObjects:o,nil]];
+  
+  // Email addresses
+  if ((o = [theValues objectForKey: @"Email1Address"]))
+    {
+      element = [self elementWithTag: @"email" ofType: @"work"];
+      [element setSingleValue: o forKey: @""];
+    }
+  
+  if ((o = [theValues objectForKey: @"Email2Address"]))
+    {
+      element = [self elementWithTag: @"email" ofType: @"home"];
+      [element setSingleValue: o  forKey: @""];
+    }
+  
+  // 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"]))
+    {
+      element = [self elementWithTag: @"email" ofType: @"three"];
+      [element setSingleValue: o  forKey: @""];
+    }
+  
+  // Formatted name
+  // MiddleName
+  // Suffix   (II)
+  // Title    (Mr.)
+  [self setFn: [theValues objectForKey: @"FileAs"]];
+
+  [self setNWithFamily: [theValues objectForKey: @"LastName"]
+                 given: [theValues objectForKey: @"FirstName"]
+            additional: nil prefixes: nil suffixes: nil];
+  
+  // IM information
+  [[self uniqueChildWithTag: @"x-aim"]
+    setSingleValue: [theValues objectForKey: @"IMAddress"]
+            forKey: @""];
+
+  //
+  // Phone numbrrs
+  //
+  element = [self elementWithTag: @"tel" ofType: @"work"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessPhoneNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"home"];
+  [element setSingleValue: [theValues objectForKey: @"HomePhoneNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"cell"];
+  [element setSingleValue: [theValues objectForKey: @"MobilePhoneNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"fax"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessFaxNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"pager"];
+  [element setSingleValue: [theValues objectForKey: @"PagerNumber"]  forKey: @""];
+  
+  // Job's title
+  if ((o = [theValues objectForKey: @"JobTitle"]))
+    [self setTitle: o];
+  
+  // WebPage (work)
+  if ((o = [theValues objectForKey: @"WebPage"]))
+    [[self elementWithTag: @"url" ofType: @"work"]
+          setSingleValue: o  forKey: @""];
+  
+  if ((o = [theValues objectForKey: @"NickName"]))
+    [self setNickname: o];
+}
+
+@end
@@ -0,0 +1,49 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSARRAYSYNCCACHE_H__
+#define __NSARRAYSYNCCACHE_H__
+
+#import <Foundation/NSArray.h>
+
+@class NSDictionary;
+
+@interface NSMutableArray (SyncCache)
+
+- (id) initWithDictionary: (NSDictionary *) theDictionary;
+
+@end
+
+@interface NSArray (SyncCache)
+
+- (NSDictionary *) dictionaryValue;
+
+@end
+
+#endif
@@ -0,0 +1,84 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSArray+SyncCache.h"
+
+#import <Foundation/NSDictionary.h>
+
+#include "SOGoSyncCacheObject.h"
+
+@implementation NSMutableArray (SyncCache)
+
+- (id) initWithDictionary: (NSDictionary *) theDictionary
+{
+  SOGoSyncCacheObject *o;
+  NSArray *allKeys;
+  id key;
+  int i;
+
+  self = [self initWithCapacity: [theDictionary count]];
+
+  allKeys = [theDictionary allKeys];
+  
+  for (i = 0; i < [allKeys count]; i++)
+    {
+      key = [allKeys objectAtIndex: i];
+      o = [SOGoSyncCacheObject syncCacheObjectWithUID: key
+                                             sequence: [theDictionary objectForKey: key]];
+      [self addObject: o];
+    }
+
+  return self;
+}
+
+@end
+
+//
+//
+//
+@implementation NSArray (SyncCache)
+
+- (NSDictionary *) dictionaryValue
+{
+  NSMutableDictionary *d;
+  SOGoSyncCacheObject *o;
+  int i;
+
+  d = [NSMutableDictionary dictionary];
+
+  for (i = 0; i < [self count]; i++)
+    {
+      o = [self objectAtIndex: i];
+      [d setObject: [o sequence]  forKey: [o uid]];
+    }
+
+  return d;
+}
+
+@end
@@ -0,0 +1,43 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSCALENDARDATEACTIVESYNC_H__
+#define __NSCALENDARDATEACTIVESYNC_H__
+
+#import <Foundation/NSCalendarDate.h>
+
+@class NSString;
+
+@interface NSCalendarDate (ActiveSync)
+
+ (NSCalendarDate *) dateFromFilterType: (NSString *) theFilterType;
+
+@end
+
+#endif
@@ -0,0 +1,87 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSCalendarDate+ActiveSync.h"
+
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#define ONE_DAY 86400
+
+@implementation NSCalendarDate (ActiveSync)
+
+//
+// See http://msdn.microsoft.com/en-us/library/gg709713(v=exchg.80).aspx for available types
+//
+ (NSCalendarDate *) dateFromFilterType: (NSString *) theFilterType
+{
+  NSCalendarDate *d;
+
+  d = [NSCalendarDate calendarDate];
+
+  if (d)
+    {
+      int value;
+      
+      switch ([theFilterType intValue])
+        {
+        case 1:
+          value = ONE_DAY;
+          break;
+        case 2:
+          value = 3 * ONE_DAY;
+          break;
+        case 3:
+          value = 7 * ONE_DAY;
+          break;
+        case 4:
+          value = 14 * ONE_DAY;
+          break;
+        case 5:
+          value = 30 * ONE_DAY;
+          break;
+        case 6:
+          value = 90 * ONE_DAY;
+          break;
+        case 7:
+          value = 180 * ONE_DAY;
+          break;
+        case 0:
+        case 8:
+        default:
+          return nil;
+        }
+
+      return [d initWithTimeIntervalSinceNow: -value];
+    }
+
+  return d;
+}
+
+@end
@@ -0,0 +1,46 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSDATAACTIVESYNC_H__
+#define __NSDATAACTIVESYNC_H__
+
+#import <Foundation/NSData.h>
+
+@class NSString;
+@class WOContext;
+
+@interface NSData (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (NSData *) wbxml2xml;
+- (NSData *) xml2wbxml;
+
+@end
+
+#endif
@@ -0,0 +1,152 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSData+ActiveSync.h"
+
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+
+#include <wbxml/wbxml.h>
+#include <wbxml/wbxml_conv.h>
+#include <wbxml/wbxml_errors.h>
+
+#define WBXMLDEBUG 0
+
+@implementation NSData (ActiveSync)
+
+- (void) _dumpToFile
+{
+  NSString *path;
+
+  path = [NSString stringWithFormat: @"/tmp/%@.data", [[NSProcessInfo processInfo] globallyUniqueString]];
+  [self writeToFile: path  atomically: YES];
+  NSLog(@"Original data written to: %@", path);
+}
+
+//
+// Encodes the data in base64 and strip newline characters
+// 
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  return [[self stringByEncodingBase64] stringByReplacingString: @"\n" withString: @""];
+}
+
+- (NSData *) wbxml2xml
+{
+  WBXMLGenXMLParams params;
+  NSData *data;
+
+  unsigned int wbxml_len, xml_len, ret;
+  unsigned char *wbxml, *xml;
+
+  wbxml = (unsigned char*)[self bytes];
+  wbxml_len = [self length];
+  xml = NULL;
+  xml_len = 0;
+  
+  params.lang = WBXML_LANG_ACTIVESYNC;
+  params.gen_type = WBXML_GEN_XML_INDENT;
+  params.indent = 1;
+  params.keep_ignorable_ws = FALSE;
+    
+  ret = wbxml_conv_wbxml2xml_withlen(wbxml, wbxml_len, &xml, &xml_len, &params);
+ 
+  if (ret != WBXML_OK)
+    {
+      NSLog(@"wbxml2xmlFromContent: failed: %s\n", wbxml_errors_string(ret));
+      [self _dumpToFile];
+      return nil;
+    }
+
+  data = [[NSData alloc] initWithBytes: xml  length: xml_len];
+
+#if WBXMLDEBUG
+  [data writeToFile: @"/tmp/protocol.decoded"  atomically: YES];
+#endif
+
+  free(xml);
+
+  return AUTORELEASE(data);
+}
+
+
+- (NSData *) xml2wbxml
+{
+  WBXMLConvXML2WBXML *conv;
+  NSData *data;
+
+  unsigned int wbxml_len, xml_len, ret;
+  unsigned char *wbxml, *xml;
+
+  xml = (unsigned char*)[self bytes];
+  xml_len = [self length];
+  wbxml = NULL;
+  wbxml_len = 0;
+  conv = NULL;
+
+  ret = wbxml_conv_xml2wbxml_create(&conv);
+
+  if (ret != WBXML_OK)
+    {
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
+      [self _dumpToFile];
+      return nil;
+    }
+
+  wbxml_conv_xml2wbxml_enable_preserve_whitespaces(conv);
+  
+  // From libwbxml's changelog in v0.11.0: "The public ID is set to unknown and the DTD is not included. This is required for Microsoft ActiveSync."
+  wbxml_conv_xml2wbxml_disable_public_id(conv);
+  wbxml_conv_xml2wbxml_disable_string_table(conv);
+
+  ret = wbxml_conv_xml2wbxml_run(conv, xml, xml_len, &wbxml, &wbxml_len);
+  
+  if (ret != WBXML_OK)
+    {
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
+      [self _dumpToFile];
+      free(wbxml);
+      wbxml_conv_xml2wbxml_destroy(conv);
+      return nil;
+    }
+
+  data = [[NSData alloc] initWithBytes: wbxml  length: wbxml_len];
+
+#if WBXMLDEBUG
+  [data writeToFile: @"/tmp/protocol.encoded"  atomically: YES];
+#endif
+
+  free(wbxml);
+  wbxml_conv_xml2wbxml_destroy(conv);
+  
+  return AUTORELEASE(data);
+}
+@end
@@ -0,0 +1,45 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSDATEACTIVESYNC_H__
+#define __NSDATEACTIVESYNC_H__
+
+#import <Foundation/NSDate.h>
+
+@class NSString;
+@class WOContext;
+
+@interface NSDate (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (NSString *) activeSyncRepresentationWithoutSeparatorsInContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,52 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSDate+ActiveSync.h"
+
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+@implementation NSDate (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  return [self descriptionWithCalendarFormat: @"%Y-%m-%dT%H:%M:%S.%FZ"  timeZone: [NSTimeZone timeZoneWithName: @"GMT"]  locale: nil];
+}
+
+
+//
+// From [MS-ASDTYPE].pdf - section 2.3 "Dates and times in calendar items MUST NOT include punctuation separators."
+//
+- (NSString *) activeSyncRepresentationWithoutSeparatorsInContext: (WOContext *) context
+{
+  return [self descriptionWithCalendarFormat: @"%Y%m%dT%H%M%SZ"  timeZone: [NSTimeZone timeZoneWithName: @"GMT"]  locale: nil];
+}
+
+
+@end
@@ -0,0 +1,55 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSSTRINGACTIVESYNC_H__
+#define __NSSTRINGACTIVESYNC_H__
+
+#import <Foundation/NSString.h>
+
+#include "SOGoActiveSyncConstants.h"
+
+@class NSCalendarDate;
+@class NSData;
+@class WOContext;
+
+@interface NSString (ActiveSync)
+
+- (NSString *) sanitizedServerIdWithType: (SOGoMicrosoftActiveSyncFolderType) folderType;
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (int) activeSyncFolderType;
+- (NSString *) realCollectionIdWithFolderType: (SOGoMicrosoftActiveSyncFolderType *) folderType;
+- (NSCalendarDate *) calendarDate;
+- (NSString *) deviceId;
+- (NSString *) deviceType;
+- (NSString *) command;
+- (NSData *) convertHexStringToBytes;
+
+@end
+
+#endif
@@ -0,0 +1,300 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#include "NSString+ActiveSync.h"
+
+#include <Foundation/NSArray.h>
+#include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSDate.h>
+
+#include <SOGo/NSString+Utilities.h>
+
+#include <NGExtensions/NSString+misc.h>
+
+@implementation NSString (ActiveSync)
+
+- (NSString *) sanitizedServerIdWithType: (SOGoMicrosoftActiveSyncFolderType) folderType
+{
+  if (folderType == ActiveSyncEventFolder)
+    {
+      int len;
+
+      len = [self length];
+
+      if (len > 4 && [self hasSuffix: @".ics"])
+        return [self substringToIndex: len-4];
+      else
+        return [NSString stringWithFormat: @"%@.ics", self];
+    }
+  
+  return self;
+}
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSString *s;
+
+  s = [self stringByEscapingHTMLString];
+
+  return [[s componentsSeparatedByCharactersInSet: [self safeCharacterSet]]
+                        componentsJoinedByString: @""];
+}
+
+- (int) activeSyncFolderType
+{
+  if ([self isEqualToString: @"inbox"])
+    return 2;
+  else if ([self isEqualToString: @"draft"])
+    return 3;
+  else if ([self isEqualToString: @"sent"])
+    return 5;
+  else if  ([self isEqualToString: @"trash"])
+    return 4;
+
+  return 12;
+}
+
+- (NSString *) realCollectionIdWithFolderType: (SOGoMicrosoftActiveSyncFolderType *) folderType;
+{
+  NSString *realCollectionId, *v;
+
+  *folderType = ActiveSyncGenericFolder;
+  v = [self stringByUnescapingURL];
+
+  if ([v hasPrefix: @"vevent/"])
+    {
+      realCollectionId = [v substringFromIndex: 7];
+      *folderType = ActiveSyncEventFolder;
+    }
+  else if ([v hasPrefix: @"vtodo/"])
+    {
+      realCollectionId = [v substringFromIndex: 6];
+      *folderType = ActiveSyncTaskFolder;
+    }
+  else if ([v hasPrefix: @"vcard/"])
+    {
+      realCollectionId = [v substringFromIndex: 6];
+      *folderType = ActiveSyncContactFolder;
+    }
+  else if ([v hasPrefix: @"mail/"])
+    {
+      realCollectionId = [[v stringByUnescapingURL] substringFromIndex: 5];
+      *folderType = ActiveSyncMailFolder;
+    }
+  else
+    {
+      realCollectionId = nil;
+    }
+
+  return realCollectionId;
+}
+
+//
+// 2014-01-16T05:00:00.000Z
+//
+// See http://www.gnustep.org/resources/documentation/Developer/Base/Reference/NSCalendarDate.html#method$NSCalendarDate-initWithString$calendarFormat$ for the format details.
+//
+- (NSCalendarDate *) calendarDate
+{
+  id o;
+
+  o = [NSCalendarDate dateWithString: self  calendarFormat: @"%Y%m%dT%H%M%SZ"];
+
+  if (!o)
+    o = [NSCalendarDate dateWithString: self  calendarFormat: @"%Y-%m-%dT%H:%M:%S.%FZ"];
+  
+  return o;
+}
+
+- (NSString *) _valueForParameter: (NSString *) theParameter
+{
+  NSArray *components;
+  NSString *s;
+  int i;
+
+  components = [[[self componentsSeparatedByString: @"?"] lastObject] componentsSeparatedByString: @"&"];
+  
+  for (i = 0; i < [components count]; i++)
+    {
+      s = [components objectAtIndex: i];
+      
+      if ([[s uppercaseString] hasPrefix: theParameter])
+        return [s substringFromIndex: [theParameter length]];
+    }
+  
+  return nil;
+}
+
+//
+// This method extracts the "DeviceId" from a URI:
+//
+// /SOGo/Microsoft-Server-ActiveSync?Cmd=FolderSync&User=sogo10&DeviceId=SEC17CD1A3E9E3F2&DeviceType=SAMSUNGSGHI317M
+//
+- (NSString *) deviceId
+{
+  NSString *s;
+
+  s = [self _valueForParameter: @"DEVICEID="];
+  
+  if (!s)
+    s = @"Unknown";
+
+  return s;
+}
+
+//
+// This method extracts the "DeviceType" from a URI:
+//
+// /SOGo/Microsoft-Server-ActiveSync?Cmd=FolderSync&User=sogo10&DeviceId=SEC17CD1A3E9E3F2&DeviceType=SAMSUNGSGHI317M
+//
+- (NSString *) deviceType
+{
+  NSString *s;
+
+  s = [self _valueForParameter: @"DEVICETYPE="];
+
+  if (!s)
+    s = @"Unknown";
+
+  return s;
+}
+
+//
+//
+//
+- (NSString *) command
+{
+  NSString *s;
+  
+  s = [self _valueForParameter: @"CMD="];
+  
+  if (!s)
+    s = @"Unknown";
+  
+  return s;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (char) _decodeHexByte: (char) byteChar
+{
+  char newByte;
+
+  if (byteChar >= 48 && byteChar <= 57)
+    newByte = (uint8_t) byteChar - 48;
+  else if (byteChar >= 65 && byteChar <= 70)
+    newByte = (uint8_t) byteChar - 55;
+  else if (byteChar >= 97 && byteChar <= 102)
+    newByte = (uint8_t) byteChar - 87;
+  else
+    newByte = -1;
+
+  return newByte;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (BOOL) _decodeHexByte: (uint8_t *) byte
+                  atPos: (NSUInteger) pos
+{
+  BOOL error = NO;
+  char newByte;
+  unichar byteChar;
+
+  byteChar = [self characterAtIndex: pos];
+  if (byteChar < 256)
+    {
+      newByte = [self _decodeHexByte: (char) byteChar];
+      if (newByte == -1)
+        error = YES;
+      else
+        *byte = newByte;
+    }
+  else
+    error = YES;
+
+  return error;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (BOOL) _decodeHexPair: (uint8_t *) byte
+                  atPos: (NSUInteger) pos
+{
+  BOOL error;
+  uint8_t lowValue, highValue;
+
+  error = [self _decodeHexByte: &highValue atPos: pos];
+  if (!error)
+    {
+      error = [self _decodeHexByte: &lowValue atPos: pos + 1];
+      if (!error)
+        *byte = highValue << 4 | lowValue;
+    }
+
+  return error;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (NSData *) convertHexStringToBytes
+{
+  NSUInteger count, strLen, bytesLen;
+  uint8_t *bytes, *currentByte;
+  NSData *decoded = nil;
+  BOOL error = NO;
+
+  strLen = [self length];
+  if ((strLen % 2) == 0)
+    {
+      bytesLen = strLen / 2;
+      bytes = NSZoneCalloc (NULL, bytesLen, sizeof (uint8_t));
+      currentByte = bytes;
+      for (count = 0; !error && count < strLen; count += 2)
+        {
+          error = [self _decodeHexPair: currentByte atPos: count];
+          currentByte++;
+        }
+      if (error)
+        NSZoneFree (NULL, bytes);
+      else
+        decoded = [NSData dataWithBytesNoCopy: bytes
+                                       length: bytesLen
+                                 freeWhenDone: YES];
+    }
+
+  return decoded;
+}
+
+@end
@@ -0,0 +1,12 @@
+In order to use this software in production environments, you need to
+get a proper usage license from Microsoft. Please contact them directly
+to negotiate the fees associated to your user base.
+
+To contact Microsoft, please visit:
+
+http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exchangeactivesyncprotocol.aspx
+
+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.
@@ -0,0 +1,42 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __SOGOACTIVESYNCCONSTANTS_H__
+#define __SOGOACTIVESYNCCONSTANTS_H__
+
+typedef enum
+{
+  ActiveSyncGenericFolder = 0,
+  ActiveSyncMailFolder = 1,
+  ActiveSyncContactFolder = 2,
+  ActiveSyncEventFolder = 3,
+  ActiveSyncTaskFolder = 4,
+} SOGoMicrosoftActiveSyncFolderType;
+
+#endif
@@ -0,0 +1,47 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __SOGOACTIVESYNCDISPATCHERSYNC_H__
+#define __SOGOACTIVESYNCDISPATCHERSYNC_H__
+
+#import "SOGoActiveSyncDispatcher.h"
+
+#import <DOM/DOMElement.h>
+#import <DOM/DOMProtocols.h>
+
+@class WOResponse;
+
+@interface SOGoActiveSyncDispatcher (Sync)
+
+- (void) processSync: (id <DOMElement>) theDocumentElement
+          inResponse: (WOResponse *) theResponse;
+
+@end
+
+#endif // SOGOACTIVESYNCDISPATCHERSYNC
@@ -0,0 +1,56 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import <Foundation/NSObject.h>
+
+#include "SOGoActiveSyncConstants.h"
+
+@class NSException;
+@class NSURL;
+
+@interface SOGoActiveSyncDispatcher : NSObject
+{
+  NSURL *folderTableURL;
+  id context;
+}
+
+- (id) collectionFromId: (NSString *) theCollectionId
+                   type: (SOGoMicrosoftActiveSyncFolderType) theFolderType;
+
+- (id) globallyUniqueIDToIMAPFolderName: (NSString *) theIdToTranslate
+                                   type: (SOGoMicrosoftActiveSyncFolderType) theFolderType;
+
+- (NSException *) dispatchRequest: (id) theRequest
+                       inResponse: (id) theResponse
+                          context: (id) theContext;
+
+- (NSURL *) folderTableURL;
+- (void) ensureFolderTableExists;
+
+@end
@@ -0,0 +1,48 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __SOGOMAILOBJECTACTIVESYNC_H__
+#define __SOGOMAILOBJECTACTIVESYNC_H__
+
+#import <Mailer/SOGoMailObject.h>
+
+@class iCalCalendar;
+@class NSDictionary;
+@class WOContext;
+
+@interface SOGoMailObject (ActiveSync)
+
+- (iCalCalendar *) calendarFromIMIPMessage;
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,808 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#include "SOGoMailObject+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTimeZone.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGExtensions/NGQuotedPrintableCoding.h>
+#import <NGExtensions/NSString+misc.h>
+#import <NGExtensions/NSString+Encoding.h>
+#import <NGImap4/NGImap4Envelope.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <NGMime/NGMimeBodyPart.h>
+#import <NGMime/NGMimeFileData.h>
+#import <NGMime/NGMimeMultipartBody.h>
+#import <NGMime/NGMimeType.h>
+#import <NGMail/NGMimeMessageParser.h>
+#import <NGMail/NGMimeMessage.h>
+#import <NGMail/NGMimeMessageGenerator.h>
+
+#include "iCalTimeZone+ActiveSync.h"
+#include "NSData+ActiveSync.h"
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+#include <Appointments/iCalEntityObject+SOGo.h>
+#include <Appointments/iCalPerson+SOGo.h>
+#include <Mailer/NSString+Mail.h>
+#include <Mailer/SOGoMailBodyPart.h>
+
+#include <SOGo/SOGoUser.h>
+
+typedef struct {
+  uint32_t dwLowDateTime;
+  uint32_t dwHighDateTime;
+} FILETIME;
+
+struct GlobalObjectId {
+  uint8_t                   ByteArrayID[16];
+  uint8_t                   YH;
+  uint8_t                   YL;
+  uint8_t                   Month;
+  uint8_t                   D;
+  FILETIME                  CreationTime;
+  uint8_t                   X[8];
+  uint32_t                  Size;
+  uint8_t*                  Data;
+};
+
+@implementation SOGoMailObject (ActiveSync)
+
+//
+//
+//
+- (void) _setInstanceDate: (struct GlobalObjectId *) newGlobalId
+                 fromDate: (NSCalendarDate *) instanceDate
+{
+  uint16_t year;
+
+  if (instanceDate)
+    {
+      //[instanceDate setTimeZone: timeZone];
+      year = [instanceDate yearOfCommonEra];
+      newGlobalId->YH = year >> 8;
+      newGlobalId->YL = year & 0xff;
+      newGlobalId->Month = [instanceDate monthOfYear];
+      newGlobalId->D = [instanceDate dayOfMonth];
+    }
+}
+
+//
+// The GlobalObjId is documented here: http://msdn.microsoft.com/en-us/library/ee160198(v=EXCHG.80).aspx
+//
+- (NSData *) _computeGlobalObjectIdFromEvent: (iCalEvent *) event
+{
+  NSData *binPrefix, *globalObjectId, *uidAsASCII;
+  NSString *prefix, *uid;
+
+  struct GlobalObjectId newGlobalId;
+  const char *bytes;
+  
+  prefix = @"040000008200e00074c5b7101a82e008";
+
+  // dataPrefix is "vCal-Uid %x01 %x00 %x00 %x00"
+  uint8_t dataPrefix[] = { 0x76, 0x43, 0x61, 0x6c, 0x2d, 0x55, 0x69, 0x64, 0x01, 0x00, 0x00, 0x00 };
+  uid = [event uid];
+
+  binPrefix = [prefix convertHexStringToBytes];
+  [binPrefix getBytes: &newGlobalId.ByteArrayID];
+  [self _setInstanceDate: &newGlobalId
+                fromDate: [event recurrenceId]];
+  uidAsASCII = [uid dataUsingEncoding: NSASCIIStringEncoding];
+  bytes = [uidAsASCII bytes];
+
+  // 0x0c is the size of our dataPrefix
+  newGlobalId.Size = 0x0c + [uidAsASCII length];
+  newGlobalId.Data = malloc(newGlobalId.Size * sizeof(uint8_t));
+  memcpy(newGlobalId.Data, dataPrefix, 0x0c);
+  memcpy(newGlobalId.Data + 0x0c, bytes, newGlobalId.Size - 0x0c);
+
+  globalObjectId = [[NSData alloc] initWithBytes: &newGlobalId  length: 40 + newGlobalId.Size*sizeof(uint8_t)];
+  free(newGlobalId.Data);
+  
+  return [globalObjectId autorelease];
+}
+
+//
+// For debugging purposes...
+//
+- (NSString *) _uidFromGlobalObjectId: (NSData *) objectId
+{
+  NSString *uid;
+
+  struct GlobalObjectId *newGlobalId;
+  NSUInteger length;
+  uint8_t *bytes;
+
+  length = [objectId length];
+  uid = nil;
+
+  bytes = malloc(length*sizeof(uint8_t));
+  [objectId getBytes: bytes  length: length];
+
+  newGlobalId = (struct GlobalObjectId *)bytes;
+
+  // We must take the offset (dataPrefix) into account
+  uid = [[NSString alloc] initWithBytes: newGlobalId->Data+12  length: newGlobalId->Size-12 encoding: NSASCIIStringEncoding];
+  free(bytes);
+
+  return AUTORELEASE(uid);
+}
+
+//
+//
+//
+- (NSString *) _emailAddressesFrom: (NSArray *) enveloppeAddresses
+{
+  NGImap4EnvelopeAddress *address;
+  NSString *email, *rc, *name;
+  NSMutableArray *addresses;
+  int i, max;
+
+  rc = nil;
+  max = [enveloppeAddresses count];
+
+  if (max > 0)
+    {
+      addresses = [NSMutableArray array];
+      for (i = 0; i < max; i++)
+        {
+          address = [enveloppeAddresses objectAtIndex: i];
+          name = [address personalName];
+          email = [NSString stringWithFormat: @"\"%@\" <%@>", (name ? name : [address baseEMail]), [address baseEMail]];
+          
+          if (email)
+            [addresses addObject: email];
+        }
+      rc = [addresses componentsJoinedByString: @", "];
+    }
+
+  return rc;
+}
+
+//
+//
+//
+- (NSData *) _preferredBodyDataInMultipartUsingType: (int) theType
+{
+  NSString *encoding, *key, *plainKey, *htmlKey, *type, *subtype;
+  NSDictionary *textParts, *part;
+  NSEnumerator *e;
+  NSData *d;
+
+  textParts = [self fetchPlainTextParts];
+  e = [textParts keyEnumerator];
+  plainKey = nil;
+  htmlKey = nil;
+  d = nil;
+
+  while ((key = [e nextObject]))
+    {
+      part = [self lookupInfoForBodyPart: key];
+      type = [part valueForKey: @"type"];
+      subtype = [part valueForKey: @"subtype"];
+      
+      if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"html"])
+        htmlKey = key;
+      else if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"plain"])
+        plainKey = key;
+    }
+
+  key = nil;
+
+  if (theType == 2)
+    key = htmlKey;
+  else if (theType == 1)
+    key = plainKey;
+
+  if (key)
+    {
+      d = [[self fetchPlainTextParts] objectForKey: key];
+
+      encoding = [[self lookupInfoForBodyPart: key] objectForKey: @"encoding"];
+      
+      if ([encoding caseInsensitiveCompare: @"base64"] == NSOrderedSame)
+        d = [d dataByDecodingBase64];
+      else if ([encoding caseInsensitiveCompare: @"quoted-printable"] == NSOrderedSame)
+        d = [d dataByDecodingQuotedPrintableTransferEncoding];
+    }
+
+  return d;
+}
+
+//
+//
+//
+- (void) _sanitizedMIMEPart: (id) thePart
+                  performed: (BOOL *) b
+{
+  if ([thePart isKindOfClass: [NGMimeMultipartBody class]])
+    {
+      NGMimeBodyPart *part;
+      NSArray *parts;
+      int i;
+
+      parts = [thePart parts];
+      
+      for (i = 0; i < [parts count]; i++)
+        {
+          part = [parts objectAtIndex: i];
+
+          [self _sanitizedMIMEPart: part
+                         performed: b];
+        }
+    }
+  else if ([thePart isKindOfClass: [NGMimeBodyPart class]])
+    {
+      NGMimeFileData *fdata;
+      id body;
+
+      body = [thePart body];
+
+      if ([body isKindOfClass: [NGMimeMultipartBody class]])
+        {
+          [self _sanitizedMIMEPart: body
+                         performed: b];
+        }
+      else if ([body isKindOfClass: [NSData class]] &&
+               [[[thePart contentType] type] isEqualToString: @"text"] &&
+               ([[[thePart contentType] subType] isEqualToString: @"plain"] || [[[thePart contentType] subType] isEqualToString: @"html"]))
+        {
+          // We make sure everything is encoded in UTF-8
+          NSString *charset, *s;
+          NGMimeType *mimeType;
+          int encoding;
+
+          charset = [[thePart contentType] valueOfParameter: @"charset"];
+          encoding = [NGMimeType stringEncodingForCharset: charset];
+
+          s = [[NSString alloc] initWithData: body  encoding: encoding];
+          AUTORELEASE(s);
+
+          if (s)
+            {
+              body = [s dataUsingEncoding: NSUTF8StringEncoding];
+            }
+
+          mimeType = [NGMimeType mimeType: [[thePart contentType] type]
+                                  subType: [[thePart contentType] subType]
+                               parameters: [NSDictionary dictionaryWithObject: @"utf-8"  forKey: @"charset"]];
+          [thePart setHeader: mimeType  forKey: @"content-type"];
+          
+          fdata = [[NGMimeFileData alloc] initWithBytes: [body bytes]
+                                                 length: [body length]];
+          
+          [thePart setBody: fdata];                  
+          RELEASE(fdata);
+          *b = YES;
+        }
+    }
+}
+
+//
+//
+//
+- (NSData *) _sanitizedMIMEMessage
+{
+  NGMimeMessageParser *parser;
+  NGMimeMessage *message;
+  NSData *d;
+  
+  BOOL b;
+  
+  d = [self content];
+
+  parser = [[NGMimeMessageParser alloc] init];
+  AUTORELEASE(parser);
+  
+  message = [parser parsePartFromData: d];
+  b = NO;
+
+  if (message)
+    {
+      [self _sanitizedMIMEPart: [message body]
+                     performed: &b];
+
+      if (b)
+        {
+          NGMimeMessageGenerator *generator;
+          
+          generator = [[NGMimeMessageGenerator alloc] init];
+          AUTORELEASE(generator);
+          
+          d = [generator generateMimeFromPart: message];
+        }
+    }
+  
+  return d;
+}
+
+//
+//
+//
+- (NSData *) _preferredBodyDataUsingType: (int) theType
+                              nativeType: (int *) theNativeType
+{
+  NSString *type, *subtype, *encoding;
+  NSData *d;
+  
+  type = [[[self bodyStructure] valueForKey: @"type"] lowercaseString];
+  subtype = [[[self bodyStructure] valueForKey: @"subtype"] lowercaseString];
+
+  d = nil;
+  
+  // We determine the native type
+  if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"plain"])
+    *theNativeType = 1;
+  else if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"html"])
+    *theNativeType = 2;
+  else if ([type isEqualToString: @"multipart"])
+    *theNativeType = 4;
+
+  // We get the right part based on the preference
+  if (theType == 1 || theType == 2)
+    {
+      if ([type isEqualToString: @"text"])
+        {
+          d = [[self fetchPlainTextParts] objectForKey: @""];
+          
+          // We check if we have base64 encoded parts. If so, we just
+          // un-encode them before using them
+          encoding = [[self lookupInfoForBodyPart: @""] objectForKey: @"encoding"];
+
+          if ([encoding caseInsensitiveCompare: @"base64"] == NSOrderedSame)
+            d = [d dataByDecodingBase64];
+          else if ([encoding caseInsensitiveCompare: @"quoted-printable"] == NSOrderedSame)
+            d = [d dataByDecodingQuotedPrintableTransferEncoding];
+
+          // Check if we must convert html->plain
+          if (theType == 1 && [subtype isEqualToString: @"html"])
+            {
+              NSString *s;
+              
+              s = [[NSString alloc] initWithData: d  encoding: NSUTF8StringEncoding];
+              AUTORELEASE(s);
+
+              s = [s htmlToText];
+              d = [s dataUsingEncoding: NSUTF8StringEncoding];
+            }
+        }
+      else if ([type isEqualToString: @"multipart"])
+        {
+          d = [self _preferredBodyDataInMultipartUsingType: theType];
+        }
+    }
+  else if (theType == 4)
+    {
+      // We sanitize the content *ONLY* for Outlook clients. Outlook has strange issues
+      // with quoted-printable/base64 encoded text parts. It just doesn't decode them.
+      if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15"])
+        d = [self _sanitizedMIMEMessage];
+      else
+        d = [self content];
+    }
+
+  return d;
+}
+
+//
+//
+//
+- (iCalCalendar *) calendarFromIMIPMessage
+{
+  NSDictionary *part;
+  NSArray *parts;
+  int i;
+
+  // We check if we have at least 2 parts and if one of them is a text/calendar
+  parts = [[self bodyStructure] objectForKey: @"parts"];
+
+  if ([parts count] > 1)
+    {
+      for (i = 0; i < [parts count]; i++)
+        {
+          part = [parts objectAtIndex: i];
+          
+          if ([[part objectForKey: @"type"] isEqualToString: @"text"] &&
+              [[part objectForKey: @"subtype"] isEqualToString: @"calendar"])
+            {
+              id bodyPart;
+
+              bodyPart = [self lookupImap4BodyPartKey: [NSString stringWithFormat: @"%d", i+1]
+                                            inContext: self->context];
+
+              if (bodyPart)
+                {
+                  iCalCalendar *calendar;
+                  NSData *calendarData;
+                  
+                  calendarData = [bodyPart fetchBLOB];
+                  calendar = nil;
+
+                  NS_DURING
+                    calendar = [iCalCalendar parseSingleFromSource: calendarData];
+                  NS_HANDLER
+                    calendar = nil;
+                  NS_ENDHANDLER
+
+                  return calendar;
+                }
+            }
+        }
+    }
+
+  return nil;
+}
+
+//
+//
+//
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) _context
+{
+  NSAutoreleasePool *pool;
+  NSData *d, *globalObjId;
+  NSArray *attachmentKeys;
+  NSMutableString *s;
+  id value;
+
+  iCalCalendar *calendar;
+      
+  int preferredBodyType, nativeBodyType;
+
+  s = [NSMutableString string];
+
+  // To - "The value of this element contains one or more e-mail addresses.
+  // If there are multiple e-mail addresses, they are separated by commas."
+  value = [self _emailAddressesFrom: [[self envelope] to]];
+  if (value)
+    [s appendFormat: @"<To xmlns=\"Email:\">%@</To>", [value activeSyncRepresentationInContext: context]];
+
+  // From
+  value = [self _emailAddressesFrom: [[self envelope] from]];
+  if (value)
+    [s appendFormat: @"<From xmlns=\"Email:\">%@</From>", [value activeSyncRepresentationInContext: context]];
+  
+  // Subject
+  value = [self decodedSubject];
+  if (value)
+    {
+      [s appendFormat: @"<Subject xmlns=\"Email:\">%@</Subject>", [value activeSyncRepresentationInContext: context]];
+      [s appendFormat: @"<ThreadTopic xmlns=\"Email:\">%@</ThreadTopic>", [value activeSyncRepresentationInContext: context]];
+    }
+
+  // DateReceived
+  value = [self date];
+  if (value)
+    [s appendFormat: @"<DateReceived xmlns=\"Email:\">%@</DateReceived>", [value activeSyncRepresentationInContext: context]];
+
+  // DisplayTo
+  [s appendFormat: @"<DisplayTo xmlns=\"Email:\">%@</DisplayTo>", [[context activeUser] login]];
+  
+  // Cc - same syntax as the To field
+  value = [self _emailAddressesFrom: [[self envelope] cc]];
+  if (value)
+    [s appendFormat: @"<Cc xmlns=\"Email:\">%@</Cc>", [value activeSyncRepresentationInContext: context]];
+    
+  // Importance - FIXME
+  [s appendFormat: @"<Importance xmlns=\"Email:\">%@</Importance>", @"1"];
+  
+  // Read
+  [s appendFormat: @"<Read xmlns=\"Email:\">%d</Read>", ([self read] ? 1 : 0)];
+  
+  // We handle MeetingRequest
+  calendar = [self calendarFromIMIPMessage];
+ 
+  if (calendar)
+    {
+      NSString *method, *className;
+      iCalPerson *attendee;
+      iCalTimeZone *tz;
+      iCalEvent *event;
+
+      iCalPersonPartStat partstat;
+      int v;
+
+      event = [[calendar events] lastObject];
+      method = [[event parent] method];
+
+      // If we are the organizer, let's pick the attendee based on the From address
+      if ([event userIsOrganizer: [context activeUser]])
+        attendee = [event findAttendeeWithEmail: [[[[self envelope] from] lastObject] baseEMail]];
+      else
+        attendee = [event findAttendeeWithEmail: [[[context activeUser] allEmails] objectAtIndex: 0]];
+
+      partstat = [attendee participationStatus];
+
+      // We generate the correct MessageClass
+      if ([method isEqualToString: @"REQUEST"])
+        className = @"IPM.Schedule.Meeting.Request";
+      else if ([method isEqualToString: @"REPLY"])
+        {
+          switch (partstat)
+            {
+            case iCalPersonPartStatAccepted:
+              className = @"IPM.Schedule.Meeting.Resp.Pos";
+              break;
+            case iCalPersonPartStatDeclined:
+              className = @"IPM.Schedule.Meeting.Resp.Neg";
+              break;
+            case iCalPersonPartStatTentative:
+            case iCalPersonPartStatNeedsAction:
+              className = @"IPM.Schedule.Meeting.Resp.Tent";
+              break;
+            default:
+              className = @"IPM.Appointment";
+              NSLog(@"unhandled part stat");
+            }
+        }
+      else if ([method isEqualToString: @"COUNTER"])
+        className = @"IPM.Schedule.Meeting.Resp.Tent";
+      else if ([method isEqualToString: @"CANCEL"])
+        className = @"IPM.Schedule.Meeting.Cancelled";
+      else
+        className = @"IPM.Appointment";
+      
+      [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", className];
+      
+      [s appendString: @"<MeetingRequest xmlns=\"Email:\">"];
+
+      [s appendFormat: @"<AllDayEvent xmlns=\"Email:\">%d</AllDayEvent>", ([event isAllDay] ? 1 : 0)];
+
+      // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
+      if ([event startDate])
+        [s appendFormat: @"<StartTime xmlns=\"Email:\">%@</StartTime>", [[event startDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      
+      if ([event timeStampAsDate])
+        [s appendFormat: @"<DTStamp xmlns=\"Email:\">%@</DTStamp>", [[event timeStampAsDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      else if ([event created])
+        [s appendFormat: @"<DTStamp xmlns=\"Email:\">%@</DTStamp>", [[event created] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      
+      // EndTime -- http://msdn.microsoft.com/en-us/library/ee157945(v=exchg.80).aspx
+      if ([event endDate])
+        [s appendFormat: @"<EndTime xmlns=\"Email:\">%@</EndTime>", [[event endDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      
+      // FIXME: Single appointment - others are not supported right now
+      [s appendFormat: @"<InstanceType xmlns=\"Email:\">%d</InstanceType>", 0];
+
+      // Location
+      if ([[event location] length])
+        [s appendFormat: @"<Location xmlns=\"Email:\">%@</Location>", [[event location] activeSyncRepresentationInContext: context]];
+
+      [s appendFormat: @"<Organizer xmlns=\"Email:\">%@</Organizer>", [[[event organizer] mailAddress] activeSyncRepresentationInContext: context]];
+
+      // This will trigger the SendMail command. We set it to no for email invitations as
+      // SOGo will send emails when MeetingResponse is called.
+      [s appendFormat: @"<ResponseRequested xmlns=\"Email:\">%d</ResponseRequested>", 0];
+
+      // Sensitivity
+      if ([[event accessClass] isEqualToString: @"PRIVATE"])
+        v = 2;
+      if ([[event accessClass] isEqualToString: @"CONFIDENTIAL"])
+        v = 3;
+      else
+        v = 0;
+
+      [s appendFormat: @"<Sensitivity xmlns=\"Email:\">%d</Sensitivity>", v];
+      
+      [s appendFormat: @"<BusyStatus xmlns=\"Email:\">%d</BusyStatus>", 2];
+
+      // Timezone
+      tz = [(iCalDateTime *)[event firstChildWithTag: @"dtstart"] timeZone];
+      
+      if (!tz)
+        tz = [iCalTimeZone timeZoneForName: @"Europe/London"];
+      
+      [s appendFormat: @"<TimeZone xmlns=\"Email:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
+      
+
+      // We disallow new time proposals
+      [s appendFormat: @"<DisallowNewTimeProposal xmlns=\"Email:\">%d</DisallowNewTimeProposal>", 1];
+      
+      // From http://blogs.msdn.com/b/exchangedev/archive/2011/07/22/working-with-meeting-requests-in-exchange-activesync.aspx:
+      //
+      // "Clients that need to determine whether the GlobalObjId  element for a meeting request corresponds to an existing Calendar
+      // object in the Calendar folder have to convert the GlobalObjId element value to a UID element value to make the comparison."
+      //
+      globalObjId = [self _computeGlobalObjectIdFromEvent: event];
+      [s appendFormat: @"<GlobalObjId xmlns=\"Email:\">%@</GlobalObjId>", [globalObjId activeSyncRepresentationInContext: context]];
+
+      // We set the right message type - we must set AS version to 14.1 for this
+      [s appendFormat: @"<MeetingMessageType xmlns=\"Email2:\">%d</MeetingMessageType>", 1];
+      [s appendString: @"</MeetingRequest>"];
+
+      // ContentClass
+      [s appendFormat: @"<ContentClass xmlns=\"Email:\">%@</ContentClass>", @"urn:content-classes:calendarmessage"];
+    }
+  else
+    {
+      // MesssageClass and ContentClass
+      [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note"];
+      [s appendFormat: @"<ContentClass xmlns=\"Email:\">%@</ContentClass>", @"urn:content-classes:message"];
+    }
+
+  // Reply-To - FIXME
+  //NSArray *replyTo = [[message objectForKey: @"envelope"] replyTo];
+  //if ([replyTo count])
+  //  [s appendFormat: @"<Reply-To xmlns=\"Email:\">%@</Reply-To>", [addressFormatter stringForArray: replyTo]];
+  
+  // InternetCPID - 65001 == UTF-8, we use this all the time for now.
+  //              - 20127 == US-ASCII
+  [s appendFormat: @"<InternetCPID xmlns=\"Email:\">%@</InternetCPID>", @"65001"];
+          
+  // Body - namespace 17
+  preferredBodyType = [[context objectForKey: @"BodyPreferenceType"] intValue];
+
+  // Make use of a local pool here as _preferredBodyDataUsingType:nativeType: will consume
+  // a significant amout of RAM and file descriptors
+  pool = [[NSAutoreleasePool alloc] init];
+
+  nativeBodyType = 1;
+  d = [self _preferredBodyDataUsingType: preferredBodyType  nativeType: &nativeBodyType];
+  
+  if (d)
+    {
+      NSString *content;
+      int len, truncated;
+      
+      content = [[NSString alloc] initWithData: d  encoding: NSUTF8StringEncoding];
+
+      // FIXME: This is a hack. We should normally avoid doing this as we might get
+      // broken encodings. We should rather tell that the data was truncated and expect
+      // a ItemOperations call to download the whole base64 encoding multipart.
+      //
+      // See http://social.msdn.microsoft.com/Forums/en-US/b9944e49-9bc9-4ab8-ba33-a9fc08557c5b/mime-raw-data-in-eas-sync-response?forum=os_exchangeprotocols
+      // for an "interesting" discussion around this.
+      //
+      if (!content)
+        content = [[NSString alloc] initWithData: d  encoding: NSISOLatin1StringEncoding];
+      
+      AUTORELEASE(content);
+      
+      content = [content activeSyncRepresentationInContext: context];
+      truncated = 0;
+    
+      len = [content length];
+      
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", preferredBodyType];
+      [s appendFormat: @"<Truncated>%d</Truncated>", truncated];
+      [s appendFormat: @"<Preview></Preview>"];
+
+      if (!truncated)
+        {
+          [s appendFormat: @"<Data>%@</Data>", content];
+          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", len];
+        }
+      [s appendString: @"</Body>"];
+    }
+
+  DESTROY(pool);
+
+  // Attachments -namespace 16
+  attachmentKeys = [self fetchFileAttachmentKeys];
+  if ([attachmentKeys count])
+    {
+      int i;
+      
+      [s appendString: @"<Attachments xmlns=\"AirSyncBase:\">"];
+      
+      for (i = 0; i < [attachmentKeys count]; i++)
+        {
+          value = [attachmentKeys objectAtIndex: i];
+
+          [s appendString: @"<Attachment>"];
+          [s appendFormat: @"<DisplayName>%@</DisplayName>", [[value objectForKey: @"filename"] activeSyncRepresentationInContext: context]];
+
+          // FileReference must be a unique identifier across the whole store. We use the following structure:
+          // mail/<foldername>/<message UID/<pathofpart>
+          // mail/INBOX/2          
+          [s appendFormat: @"<FileReference>mail/%@/%@/%@</FileReference>", [[[self container] relativeImap4Name] stringByEscapingURL], [self nameInContainer], [value objectForKey: @"path"]];
+
+          [s appendFormat: @"<Method>%d</Method>", 1]; // See: http://msdn.microsoft.com/en-us/library/ee160322(v=exchg.80).aspx
+          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [[value objectForKey: @"size"] intValue]];
+          //[s appendFormat: @"<IsInline>%d</IsInline>", 1];
+          [s appendString: @"</Attachment>"];
+        }
+
+      [s appendString: @"</Attachments>"];
+    }
+  
+  // Flags
+  [s appendString: @"<Flag xmlns=\"Email:\">"];
+  [s appendFormat: @"<FlagStatus>%d</FlagStatus>", 0];
+  [s appendString: @"</Flag>"];
+  
+  // FIXME - support these in the future
+  //[s appendString: @"<ConversationId xmlns=\"Email2:\">foobar</ConversationId>"];
+  //[s appendString: @"<ConversationIndex xmlns=\"Email2:\">zot=</ConversationIndex>"];
+  
+  // NativeBodyType -- http://msdn.microsoft.com/en-us/library/ee218276(v=exchg.80).aspx
+  // This is a required child element.
+  // 1 -> plain/text, 2 -> HTML and 3 -> RTF
+  if (nativeBodyType == 4)
+    nativeBodyType = 1;
+
+  [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", nativeBodyType];
+  
+  return s;
+}
+
+//
+//
+//
+// Exemple for a message being marked as read:
+//
+//  <Change>
+//   <ServerId>607</ServerId>
+//   <ApplicationData>
+//    <Read xmlns="Email:">1</Read>
+//   </ApplicationData>
+//  </Change>
+// </Commands>
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) _context
+{
+  id o;
+
+  if ((o = [theValues objectForKey: @"Flag"]))
+    {
+      o = [o objectForKey: @"FlagStatus"];
+      
+      if ([o intValue])
+        [self addFlags: @"\\Flagged"];
+      else
+        [self removeFlags: @"\\Flagged"]; 
+    }
+  
+  if ((o = [theValues objectForKey: @"Read"]))
+    {
+      if ([o intValue])
+        [self addFlags: @"seen"];
+      else
+        [self removeFlags: @"seen"];;
+    }
+}
+
+@end
@@ -0,0 +1,55 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef __SOGOSYNCCACHEOBJECT_H__
+#define __SOGOSYNCCACHEOBJECT_H__
+
+#import <Foundation/NSObject.h>
+
+@class NSNull;
+
+@interface SOGoSyncCacheObject : NSObject
+{
+  id _uid;
+  id _sequence;
+}
+
+ (id) syncCacheObjectWithUID: (id) theUID  sequence: (id) theSequence;
+- (id) uid;
+- (void) setUID: (id) theUID;
+- (id) sequence;
+- (void) setSequence: (id) theSequence;
+
+- (NSComparisonResult) compareUID: (SOGoSyncCacheObject *) theSyncCacheObject;
+- (NSComparisonResult) compareSequence: (SOGoSyncCacheObject *) theSyncCacheObject;
+
+@end
+
+#endif
@@ -0,0 +1,122 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "SOGoSyncCacheObject.h"
+
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
+
+@implementation SOGoSyncCacheObject
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      _uid = nil;
+      _sequence = nil;
+    }
+
+  return self;
+}
+
+ (id) syncCacheObjectWithUID: (id) theUID  sequence:  (id) theSequence;
+{
+  id o;
+
+  o = [[self alloc] init];
+ 
+  [o setUID: theUID];
+  [o setSequence: theSequence];
+  
+  return o;
+}
+
+- (void) dealloc
+{
+  RELEASE(_uid);
+  RELEASE(_sequence);
+  [super dealloc];
+}
+
+- (id) uid
+{
+  return _uid;
+}
+
+- (void) setUID: (id) theUID
+{
+  ASSIGN(_uid, theUID);
+}
+
+- (id) sequence
+{
+  return _sequence;
+}
+
+- (void) setSequence: (id) theSequence
+{
+  ASSIGN(_sequence, theSequence);
+}
+
+
+- (NSComparisonResult) compareUID: (SOGoSyncCacheObject *) theSyncCacheObject
+{
+  return [[self uid] compare: [theSyncCacheObject uid]];
+}
+
+//
+// We might get NSNull values here, so if both are NSNull instances,
+// we sort by UID. If both sequences are equal, we also sort by UID.
+//
+- (NSComparisonResult) compareSequence: (SOGoSyncCacheObject *) theSyncCacheObject
+{
+  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]])
+    return NSOrderedDescending;
+  
+  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)
+    return [self compareUID: theSyncCacheObject];
+  
+  return [[self sequence] compare: [theSyncCacheObject sequence]];
+}
+
+- (NSString *) description
+{
+  return [NSString stringWithFormat: @"%@-%@", _uid, _sequence];
+}
+
+@end
@@ -0,0 +1,101 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import <NGObjWeb/SoObjectWebDAVDispatcher.h>
+
+#include <NGObjWeb/SoObject+SoDAV.h>
+#include <NGObjWeb/WEClientCapabilities.h>
+#include <NGObjWeb/WOContext.h>
+#include <NGObjWeb/WORequest.h>
+#include <NGObjWeb/WOResponse.h>
+
+#import <Foundation/NSArray.h>
+
+@interface SoObjectWebDAVDispatcher (ActiveSync)
+
+- (id)_callObjectMethod:(NSString *)_method inContext:(WOContext *)_ctx;
+- (id) doOPTIONS:(WOContext *)_ctx;
+
+@end
+
+@implementation SoObjectWebDAVDispatcher (ActiveSync)
+
+- (id) doOPTIONS:(WOContext *)_ctx 
+{
+  WOResponse *response;
+  
+  /*
+    See example: http://msdn.microsoft.com/en-us/library/ee204257(v=exchg.80).aspx
+  */
+  if ([[[_ctx request] requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"])
+    {
+      response = [_ctx response];
+      [response setStatus: 200];
+      
+      [response setHeader: @"private"  forKey: @"Cache-Control"];
+      [response setHeader: @"OPTIONS, POST"  forKey: @"Allow"];
+      [response setHeader: @"14.1"  forKey: @"MS-Server-ActiveSync"];
+      [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"];
+    }
+  else
+    {
+      NSArray    *tmp;
+      id         result;
+      
+      /* this checks whether the object provides a specific OPTIONS method */
+      if ((result = [self _callObjectMethod:@"OPTIONS" inContext:_ctx]) != nil)
+        return result;
+      
+      response = [_ctx response];
+      [response setStatus:200 /* OK */];
+      
+      if ((tmp = [self->object davAllowedMethodsInContext:_ctx]) != nil) 
+        [response setHeader:[tmp componentsJoinedByString:@", "] forKey:@"allow"];
+      
+      if ([[[_ctx request] clientCapabilities] isWebFolder]) {
+        /*
+          As described over here:
+          http://teyc.editthispage.com/2005/06/02
+          
+          This page also says that: "MS-Auth-Via header is not required to work
+       with Web Folders".
+        */
+        [response setHeader:[tmp componentsJoinedByString:@", "] forKey:@"public"];
+      }
+      
+      if ((tmp = [self->object davComplianceClassesInContext:_ctx]) != nil) 
+        [response setHeader:[tmp componentsJoinedByString:@", "] forKey:@"dav"];
+    }
+  
+  return response;
+}
+
+@end
@@ -0,0 +1,34 @@
+include ../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
+
+NEEDS_GUI=no
+BUNDLE_EXTENSION     = .SOGo
+BUNDLE_INSTALL_DIR   = $(SOGO_LIBDIR)
+WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)
+WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)
+
+# SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+ADDITIONAL_INCLUDE_DIRS += \
+	-I.. \
+	-I../.. \
+        -I../../SOPE
+
+ADDITIONAL_LIB_DIRS += \
+        -L../SoObjects/SOGo/SOGo.framework/ \
+	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
+	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
+	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
+        -L/usr/local/lib
+
+BUNDLE_LIBS += \
+	-lSOGo					\
+	-lGDLContentStore			\
+	-lGDLAccess				\
+	-lNGObjWeb				\
+	-lNGCards -lNGMime -lNGLdap		\
+	-lNGStreams -lNGExtensions -lEOControl	\
+	-lDOM -lSaxObjC -lSBJson
+
+ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)
@@ -0,0 +1,46 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __ICALALARMACTIVESYNC_H__
+#define __ICALALARMACTIVESYNC_H__
+
+#import <NGCards/iCalAlarm.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalAlarm (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,106 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "iCalAlarm+ActiveSync.h"
+
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <NGCards/iCalAlarm.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalTrigger.h>
+
+@implementation iCalAlarm (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+
+  s = [NSMutableString string];
+  
+  if ([[self action] caseInsensitiveCompare: @"DISPLAY"] == NSOrderedSame)
+    {
+      NSCalendarDate *nextAlarmDate;
+      NSInteger delta;
+      
+      nextAlarmDate = [self nextAlarmDate];
+      delta = (int)(([[(iCalEvent *)parent startDate] timeIntervalSince1970] - [nextAlarmDate timeIntervalSince1970])/60);
+      
+      // don't send negative reminder - not supported
+      if (delta > 0)
+        [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", delta];
+    }
+  
+  return s;
+}
+
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  iCalTrigger *trigger;
+  id o;
+
+  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
+    {
+      if (([o intValue] % 1440) == 0)
+        [trigger setSingleValue: [NSString stringWithFormat: @"-P%dD", ([o intValue] / 1440)]  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: @""];
+        }
+    }
+}
+
+@end
@@ -0,0 +1,47 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef __ICALEVENTACTIVESYNC_H__
+#define __ICALEVENTACTIVESYNC_H__
+
+#import <NGCards/iCalEvent.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalEvent (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,537 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#import "iCalEvent+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
+
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
+
+#import <Appointments/iCalEntityObject+SOGo.h>
+
+#include "iCalAlarm+ActiveSync.h"
+#include "iCalRecurrenceRule+ActiveSync.h"
+#include "iCalTimeZone+ActiveSync.h"
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+@implementation iCalEvent (ActiveSync)
+
+- (int) _attendeeStatus: (iCalPerson *) attendee
+{
+  int  attendee_status;
+  
+  attendee_status = 5;
+  if ([[attendee partStat] caseInsensitiveCompare: @"ACCEPTED"] == NSOrderedSame)
+    attendee_status = 3;
+  else if ([[attendee partStat] caseInsensitiveCompare: @"DECLINED"] == NSOrderedSame)
+    attendee_status = 4;
+  else if ([[attendee partStat] caseInsensitiveCompare: @"TENTATIVE"] == NSOrderedSame)
+    attendee_status = 2;
+
+  return attendee_status;
+}
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+  NSArray *attendees;
+
+  iCalPerson *organizer, *attendee;
+  iCalTimeZone *tz;
+  id o;
+
+  int v;
+
+  NSTimeZone *userTimeZone;
+  userTimeZone = [[[context activeUser] userDefaults] timeZone];
+
+  s = [NSMutableString string];
+  
+  [s appendFormat: @"<AllDayEvent xmlns=\"Calendar:\">%d</AllDayEvent>", ([self isAllDay] ? 1 : 0)];
+
+  // DTStamp -- http://msdn.microsoft.com/en-us/library/ee219470(v=exchg.80).aspx
+  if ([self timeStampAsDate])
+    [s appendFormat: @"<DTStamp xmlns=\"Calendar:\">%@</DTStamp>", [[self timeStampAsDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+  else if ([self created])
+    [s appendFormat: @"<DTStamp xmlns=\"Calendar:\">%@</DTStamp>", [[self created] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+  
+  // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
+  if ([self startDate])
+    {
+      if ([self isAllDay])
+        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>",
+           [[[self startDate] dateByAddingYears: 0 months: 0 days: 0
+                                          hours: 0 minutes: 0
+                                        seconds: ([userTimeZone secondsFromGMTForDate: [self startDate]])*-1]
+             activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      else
+        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>", [[self startDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+    }
+
+  // EndTime -- http://msdn.microsoft.com/en-us/library/ee157945(v=exchg.80).aspx
+  if ([self endDate])
+    {
+      if ([self isAllDay])
+        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>",
+           [[[self endDate] dateByAddingYears: 0 months: 0 days: 0
+                                        hours: 0 minutes: 0
+                                      seconds: ([userTimeZone secondsFromGMTForDate: [self endDate]])*-1]
+             activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      else
+        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>", [[self endDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+    }
+
+  // Timezone
+  tz = [(iCalDateTime *)[self firstChildWithTag: @"dtstart"] timeZone];
+
+  if (!tz)
+    tz = [iCalTimeZone timeZoneForName: @"Europe/London"];
+
+  [s appendFormat: @"<TimeZone xmlns=\"Calendar:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
+  
+  // Organizer and other invitations related properties
+  if ((organizer = [self organizer]))
+    {
+      o = [organizer rfc822Email];
+      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];
+        }
+    }
+  
+  // Attendees
+  attendees = [self attendees];
+  
+  if ([attendees count])
+    {
+      int i, attendee_status, attendee_type;
+      
+      [s appendString: @"<Attendees xmlns=\"Calendar:\">"];
+
+      for (i = 0; i < [attendees count]; i++)
+        {
+          [s appendString: @"<Attendee xmlns=\"Calendar:\">"];
+
+          attendee = [attendees objectAtIndex: i];
+          [s appendFormat: @"<Attendee_Email xmlns=\"Calendar:\">%@</Attendee_Email>", [attendee rfc822Email]];
+          [s appendFormat: @"<Attendee_Name xmlns=\"Calendar:\">%@</Attendee_Name>", [[attendee cn] activeSyncRepresentationInContext: context]];
+          
+          attendee_status = [self _attendeeStatus: attendee];
+            
+          [s appendFormat: @"<Attendee_Status xmlns=\"Calendar:\">%d</Attendee_Status>", attendee_status];
+
+          // FIXME: handle resource
+          if ([[attendee role] caseInsensitiveCompare: @"REQ-PARTICIPANT"] == NSOrderedSame)
+            attendee_type = 1;
+          else
+            attendee_type = 2;
+          
+          [s appendFormat: @"<Attendee_Type xmlns=\"Calendar:\">%d</Attendee_Type>", attendee_type];
+          [s appendString: @"</Attendee>"];
+        }
+      [s appendString: @"</Attendees>"];
+    }
+  
+  // This depends on the 'NEEDS-ACTION' parameter.
+  // This will trigger the SendMail command
+  if ([self userIsAttendee: [context activeUser]])
+    {
+      iCalPerson *attendee;
+      
+      int attendee_status;
+
+      attendee = [self userAsAttendee: [context activeUser]];
+      attendee_status = [self _attendeeStatus: attendee];
+  
+      [s appendFormat: @"<ResponseRequested xmlns=\"Calendar:\">%d</ResponseRequested>", 1];
+      [s appendFormat: @"<ResponseType xmlns=\"Calendar:\">%d</ResponseType>", attendee_status];
+      [s appendFormat: @"<MeetingStatus xmlns=\"Calendar:\">%d</MeetingStatus>", 3];
+      [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>", 2];
+    }
+
+  // Subject -- http://msdn.microsoft.com/en-us/library/ee157192(v=exchg.80).aspx
+  if ([[self summary] length])
+    [s appendFormat: @"<Subject xmlns=\"Calendar:\">%@</Subject>", [[self summary] activeSyncRepresentationInContext: context]];
+  
+  // Location
+  if ([[self location] length])
+    [s appendFormat: @"<Location xmlns=\"Calendar:\">%@</Location>", [[self location] activeSyncRepresentationInContext: context]];
+  
+  // Importance - NOT SUPPORTED - DO NOT ENABLE
+  //o = [self priority];
+  //if ([o isEqualToString: @"9"])
+  //  v = 0;
+  //else if ([o isEqualToString: @"1"])
+  //  v = 2;
+  //else
+  //  v = 1;
+  //[s appendFormat: @"<Importance xmlns=\"Calendar:\">%d</Importance>", v];
+
+  // UID -- http://msdn.microsoft.com/en-us/library/ee159919(v=exchg.80).aspx
+  if ([[self uid] length])
+    [s appendFormat: @"<UID xmlns=\"Calendar:\">%@</UID>", [self uid]];
+  
+  // Sensitivity
+  if ([[self accessClass] isEqualToString: @"PRIVATE"])
+    v = 2;
+  if ([[self accessClass] isEqualToString: @"CONFIDENTIAL"])
+    v = 3;
+  else
+    v = 0;
+
+  [s appendFormat: @"<Sensitivity xmlns=\"Calendar:\">%d</Sensitivity>", v];
+  
+  // Reminder -- http://msdn.microsoft.com/en-us/library/ee219691(v=exchg.80).aspx
+  // TODO: improve this to handle more alarm types
+  if ([self hasAlarms]) 
+    {
+      iCalAlarm *alarm;
+      
+      alarm = [[self alarms] objectAtIndex: 0];
+      [s appendString: [alarm activeSyncRepresentationInContext: context]];
+    }
+
+  // Recurrence rules
+  if ([self isRecurrent])
+    {
+      [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
+    }
+
+  // Comment
+  o = [self comment];
+  if ([o length])
+    {
+      o = [o activeSyncRepresentationInContext: context];
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1];
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Truncated>%d</Truncated>", 0];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
+    }
+
+  [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", 1];
+
+  return s;
+}
+
+//
+// To understand meeting requests/responses, see:
+//
+// http://blogs.msdn.com/b/exchangedev/archive/2011/07/22/working-with-meeting-requests-in-exchange-activesync.aspx
+// http://blogs.msdn.com/b/exchangedev/archive/2011/07/29/working-with-meeting-responses-in-exchange-activesync.aspx
+//
+//
+// Here is an example of a Sync call when sogo10 accepts an invitation from sogo3:
+//
+// <Change>
+//  <ServerId>2978-52EA9D00-1-A253E70.ics</ServerId>
+//  <ApplicationData>
+//   <TimeZone xmlns="Calendar:">LAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==</TimeZone>
+//   <AllDayEvent xmlns="Calendar:">0</AllDayEvent>
+//   <StartTime xmlns="Calendar:">20140207T130000Z</StartTime>
+//   <EndTime xmlns="Calendar:">20140207T140000Z</EndTime>
+//   <DTStamp xmlns="Calendar:">20140130T185245Z</DTStamp>
+//   <Subject xmlns="Calendar:">test 8</Subject>
+//   <Sensitivity xmlns="Calendar:">0</Sensitivity>
+//   <Body xmlns="AirSyncBase:">
+//    <Type>1</Type>
+//    <Data/>
+//   </Body>
+//   <Organizer_Email xmlns="Calendar:">sogo3@example.com</Organizer_Email>
+//   <UID xmlns="Calendar:">2978-52EA9D00-1-A253E70</UID>
+//   <Attendees xmlns="Calendar:">
+//    <Attendee>
+//     <Attendee_Name>sogo10</Attendee_Name>
+//     <Attendee_Email>sogo10@example.com</Attendee_Email>
+//     <Attendee_Type>1</Attendee_Type>
+//    </Attendee>
+//   </Attendees>
+//   <BusyStatus xmlns="Calendar:">2</BusyStatus>
+//   <MeetingStatus xmlns="Calendar:">3</MeetingStatus>
+//   <Organizer_Name xmlns="Calendar:">Wolfgang Fritz</Organizer_Name>
+//  </ApplicationData>
+// </Change>
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  iCalDateTime *start, *end;
+  NSTimeZone *userTimeZone;
+  iCalTimeZone *tz;
+  id o;
+
+  NSInteger tzOffset;
+  BOOL isAllDay;
+  
+  if ((o = [theValues objectForKey: @"UID"]))
+    [self setUid: o];
+    
+  // FIXME: merge with iCalToDo
+  if ((o = [theValues objectForKey: @"Subject"]))
+    [self setSummary: o];
+
+  isAllDay = NO;
+  if ([[theValues objectForKey: @"AllDayEvent"] intValue])
+    {
+      isAllDay = YES;
+    }
+
+  //
+  // 0- free, 1- tentative, 2- busy and 3- out of office
+  //
+  if ((o = [theValues objectForKey: @"BusyStatus"]))
+    {
+      [o intValue];
+    }
+
+  //
+  //
+  //
+  if ((o = [theValues objectForKey: @"MeetingStatus"]))
+    {
+      [o intValue];
+    }
+
+  //
+  // 0- normal, 1- personal, 2- private and 3-confidential
+  //
+  if ((o = [theValues objectForKey: @"Sensitivy"]))
+    {
+      switch ([o intValue])
+        {
+        case 2:
+          [self setAccessClass: @"PRIVATE"];
+          break;
+        case 3:
+          [self setAccessClass: @"CONFIDENTIAL"];
+          break;
+        case 0:
+        case 1:
+        default:
+          [self setAccessClass: @"PUBLIC"];
+        }
+    }
+
+  if ((o = [theValues objectForKey: @"TimeZone"]))
+    {
+      // Ugh, we ignore it for now.
+      userTimeZone = [[[context activeUser] userDefaults] timeZone];
+      tz = [iCalTimeZone timeZoneForName: [userTimeZone name]];
+      [(iCalCalendar *) parent addTimeZone: tz];
+    }
+  
+  // FIXME: merge with iCalToDo
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
+  if ((o = [theValues objectForKey: @"Location"]))
+    [self setLocation: o];
+
+  if ((o = [theValues objectForKey: @"StartTime"]))
+    {
+      o = [o calendarDate];
+      start = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
+      [start setTimeZone: tz];
+
+      if (isAllDay)
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [start setDate: o];
+          [start setTimeZone: nil];
+        }
+      else
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [start setDateTime: o];
+        }
+    }
+
+  if ((o = [theValues objectForKey: @"EndTime"]))
+    {
+      o = [o calendarDate];
+      end = (iCalDateTime *) [self uniqueChildWithTag: @"dtend"];
+      [end setTimeZone: tz];
+
+      if (isAllDay)
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [end setDate: o];
+          [end setTimeZone: nil];
+        }
+      else
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [end setDateTime: o];
+        }
+    }
+
+  //
+  // 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"]))
+    {           
+      // 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];
+      [self addToAlarms: alarm];
+      RELEASE(alarm);
+    }
+  else
+    {
+      // We remove existing alarm since no reminder in the ActiveSync payload
+      [self removeAllAlarms];
+    }
+  
+  // Recurrence
+  if ((o = [theValues objectForKey: @"Recurrence"]))
+    {
+      iCalRecurrenceRule *rule;
+      
+      rule = [[iCalRecurrenceRule alloc] init];
+      [self setRecurrenceRules: [NSArray arrayWithObject: rule]];
+      RELEASE(rule);
+      
+      [rule takeActiveSyncValues: o  inContext: context];
+    }
+
+  // Organizer - we don't touch the value unless we're the organizer
+  if ((o = [theValues objectForKey: @"Organizer_Email"]) &&
+      ([self userIsOrganizer: [context activeUser]] || [[context activeUser] hasEmail: o]))
+    {
+      iCalPerson *person;
+      
+      person = [iCalPerson elementWithTag: @"organizer"];
+      [person setEmail: o];
+      [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]])
+    {
+      if ((o = [theValues objectForKey: @"Attendees"]))
+        {
+          NSMutableArray *attendees;
+          NSDictionary *attendee;
+          iCalPerson *person;
+          int status, i;
+          
+          attendees = [NSMutableArray array];
+          
+          for (i = 0; i < [o count]; i++)
+            {
+              // Each attendee has is a dictionary similar to this:
+              // { "Attendee_Email" = "sogo3@example.com"; "Attendee_Name" = "Wolfgang Fritz"; "Attendee_Status" = 5; "Attendee_Type" = 1; }
+              attendee = [o objectAtIndex: i];
+              
+              person = [iCalPerson elementWithTag: @"attendee"];
+              [person setCn: [attendee objectForKey: @"Attendee_Name"]];
+              [person setEmail: [attendee objectForKey: @"Attendee_Email"]];
+              
+              status = [[attendee objectForKey: @"Attendee_Status"] intValue];
+              
+              switch (status)
+                {
+                case 2:
+                  [person setPartStat: @"TENTATIVE"];
+                  break;
+                case 3:
+                  [person setPartStat: @"ACCEPTED"];
+                  break;
+                case 4:
+                  [person setPartStat: @"DECLINED"];
+                  break;
+                case 0:
+                case 5:
+                default:
+                  [person setPartStat: @"NEEDS-ACTION"];
+                  break;
+                }
+              
+              // FIXME: handle Attendee_Type
+              
+              [attendees addObject: person];
+            }
+          
+          [self setAttendees: attendees];
+        }
+    }
+}
+
+@end
@@ -0,0 +1,48 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef __ICALRECURRENCERULEACTIVESYNC_H__
+#define __ICALRECURRENCERULEACTIVESYNC_H__
+
+#import <NGCards/iCalRecurrenceRule.h>
+
+@class NSDictionary;
+@class NSString;
+@class WOContext;
+
+@interface iCalRecurrenceRule (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext:(WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,355 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#import "iCalRecurrenceRule+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import <NGCards/iCalByDayMask.h>
+
+#import "NSCalendarDate+ActiveSync.h"
+#import "NSDate+ActiveSync.h"
+
+@implementation iCalRecurrenceRule (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+  int type;
+
+  s = [NSMutableString string];
+  
+  [s appendString: @"<Recurrence xmlns=\"Calendar:\">"];
+
+  // 0 -> daily, 1 -> weekly, 2 -> montly, 5 -> yearly
+  type = 0;
+
+  if ([self frequency] == iCalRecurrenceFrequenceDaily)
+    {
+      type = 0;
+
+      // 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=\"Calendar:\">%d</Recurrence_DayOfWeek>", (2|4|8|16|32)];
+        }
+      else
+        {
+          [s appendFormat: @"<Recurrence_Interval xmlns=\"Calendar:\">%d</Recurrence_Interval>", [self repeatInterval]]; 
+        }
+    }
+  else if ([self frequency] == iCalRecurrenceFrequenceWeekly)
+    {
+      iCalWeekOccurrences *occurrences;
+      int i, v;
+
+      type = 1;
+
+      occurrences = [[self byDayMask] weekDayOccurrences];
+      v = 0;
+
+      for (i = 0; i < 7; i++)
+        {
+          if (occurrences[0][i])
+            v += (1 << i);
+        }
+
+      [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)
+    {
+      if ([[self byDay] length])
+        {
+          int firstOccurrence;
+          iCalByDayMask *dm;
+          
+          type = 3; // recurs monthly on the nth day
+          dm = [self byDayMask];
+          firstOccurrence = [dayMask firstOccurrence];
+
+          // Handle the case for "Last day of the month"
+          if (firstOccurrence < 0)
+            firstOccurrence = 5;
+
+          [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])
+        {
+          NSArray *days;
+          
+          type = 2; // recurs monthly
+          days = [self byMonthDay];
+          if ([days count] > 0 && [[days objectAtIndex: 0] intValue] < 0)
+            {
+              // Last day of the month
+              iCalByDayMask *dm;
+          
+              dm = [self byDayMask];
+              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];
+              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", 5];
+            }
+          else
+            {
+              // Unsupported rule in ActiveSync/Outlook. Rule that says "Repeat on the 7th and 8th of each month".
+              // FIXME
+            }
+        }
+    }
+  else if ([self frequency] == iCalRecurrenceFrequenceYearly)
+    {
+      type = 6; // Yearly on the nth day
+      
+      if ([[self flattenedValuesForKey: @"bymonth"] length])
+        {
+          if ([[self byDay] length])
+            {
+              int firstOccurrence;
+              iCalByDayMask *dm;
+              
+              dm = [self byDayMask];
+              firstOccurrence = [dm firstOccurrence];
+              if (firstOccurrence < 0)
+                firstOccurrence = 5;
+              
+              [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=\"Calendar:\">%@</Recurrence_DayOfMonth>",
+                 [self flattenedValuesForKey: @"bymonthday"]];
+              
+              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%@</Recurrence_MonthOfYear>",
+                 [self flattenedValuesForKey: @"bymonth"]];
+            }
+        }
+      else
+        type = 5;
+    }
+  
+  [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=\"Calendar:\">%@</Recurrence_Occurrences>",
+         [self flattenedValuesForKey: @"count"]];
+    }
+  else if ([self untilDate])
+    {
+      NSCalendarDate *date;
+      
+      date = [self untilDate];
+      //ud = [[context activeUser] userDefaults];
+      //[date setTimeZone: [ud timeZone]];
+      
+      [s appendFormat: @"<Recurrence_Until xmlns=\"Calendar:\">%@</Recurrence_Until>",
+         [date activeSyncRepresentationWithoutSeparatorsInContext: context]];
+    }  
+
+
+  [s appendString: @"</Recurrence>"];
+
+  return s;
+}
+
+//
+//
+//
+- (void) _setByDayFromValues: (NSDictionary *) theValues
+{
+  NSString *day;
+  id o;
+  
+  unsigned int day_of_week;
+  int i, week_of_month;
+  
+  o = [theValues objectForKey: @"Recurrence_DayOfWeek"];
+  
+  // The documentation says WeekOfMonth must be between 1 and 5. The value
+  // 5 means "last week of month"
+  week_of_month = [[theValues objectForKey: @"Recurrence_WeekOfMonth"] intValue];
+  
+  if (week_of_month > 4)
+    week_of_month = -1;
+  
+  // We find the correct day of the week
+  day_of_week = [o intValue];
+  
+  for (i = 0; i < 7; i++)
+    {
+      if ((1<<i) == day_of_week)
+        {
+          day_of_week = i;
+          break;
+        }
+    }
+  
+  day = [self iCalRepresentationForWeekDay: i];
+  
+  [self setSingleValue: [NSString stringWithFormat: @"%d%@",
+                                  week_of_month, day]
+                forKey: @"byday"];
+}
+
+- (void) _setByMonthFromValues: (NSDictionary *) theValues
+{
+  unsigned int month_of_year;
+  
+  month_of_year = [[theValues objectForKey: @"Recurrence_MonthOfYear"] intValue];
+  
+  [self setSingleValue: [NSString stringWithFormat: @"%d", month_of_year]
+                forKey: @"bymonth"];
+}
+
+//
+//
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  id o;
+
+  int recurrenceType;
+
+  recurrenceType = [[theValues objectForKey: @"Recurrence_Type"] intValue];
+
+  if ((o = [theValues objectForKey: @"Recurrence_Interval"]))
+    {
+      [self setRepeatInterval: [o intValue]];
+    }
+  else
+    [self setRepeatInterval: 1];
+  
+  switch (recurrenceType)
+    {                                          
+      //
+      // Daily
+      //
+    case 0:
+      [self setFrequency: iCalRecurrenceFrequenceDaily];
+
+      
+      // Every weekday
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfWeek"]))
+        {
+          [self setByDayMask: [iCalByDayMask byDayMaskWithWeekDays]];
+        }
+      break;
+      //
+      // Weekly
+      //
+    case 1:
+      [self setFrequency: iCalRecurrenceFrequenceWeekly];
+
+      // 42 == Every Monday, Wednesday and Friday, for example 
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfWeek"]))
+        {
+          iCalWeekOccurrences days;
+          unsigned int i, v;
+          
+          memset(days, 0, 7 * sizeof(iCalWeekOccurrence));
+          v = [o intValue];
+          
+          for (i = 0; i < 7; i++)
+            {
+              if (v & (1<<i))
+                days[i] = iCalWeekOccurrenceAll;
+            }
+
+          [self setByDayMask: [iCalByDayMask byDayMaskWithDays: days]];
+        }
+      break;
+      //
+      // Montly
+      //
+    case 2:
+    case 3:
+      [self setFrequency: iCalRecurrenceFrequenceMonthly];
+      
+      // The 5th of every X month(s)
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfMonth"]))
+        {
+          [self setValues: [NSArray arrayWithObject: o]
+                  atIndex: 0 forKey: @"bymonthday"];
+        }
+      // The 3rd Thursay every X month(s)
+      else if ((o = [theValues objectForKey: @"Recurrence_DayOfWeek"]))
+        {
+          [self _setByDayFromValues: theValues];
+        }
+
+      break;
+      //
+      // Yearly
+      //
+    case 5:
+    case 6:
+    default:
+      [self setFrequency: iCalRecurrenceFrequenceYearly];
+
+      // On April 19th 
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfMonth"]))
+        {
+          [self setValues: [NSArray arrayWithObject: o] atIndex: 0
+                   forKey: @"bymonthday"];
+          
+          [self _setByMonthFromValues: theValues];
+        }
+      else
+        {
+          // On the Second Wednesday of April
+          [self _setByDayFromValues: theValues];
+          [self _setByMonthFromValues: theValues];
+        }
+
+      break;
+    }
+
+  if ((o = [theValues objectForKey: @"Recurrence_Occurrences"]))
+    {
+      [self setRepeatCount: [o intValue]];
+    }
+  else if ((o = [theValues objectForKey: @"Recurrence_Until"]))
+    {
+      [self setUntilDate: [o calendarDate]];
+    }
+}
+
+@end
@@ -0,0 +1,44 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __ICALTIMEZONEACTIVESYNC_H__
+#define __ICALTIMEZONEACTIVESYNC_H__
+
+#import <NGCards/iCalTimeZone.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalTimeZone (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,165 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "iCalTimeZone+ActiveSync.h"
+
+#include <Foundation/NSArray.h>
+#include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSDate.h>
+#include <Foundation/NSString.h>
+
+#import <NGCards/iCalByDayMask.h>
+#import <NGCards/iCalTimeZonePeriod.h>
+#import <NGCards/iCalRecurrenceRule.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+
+#include "NSData+ActiveSync.h"
+
+struct SYSTEMTIME {
+  uint16_t wYear;
+  uint16_t wMonth;
+  uint16_t wDayOfWeek;
+  uint16_t wDay;
+  uint16_t wHour;
+  uint16_t wMinute;
+  uint16_t wSecond;
+  uint16_t wMilliseconds;
+};
+
+@interface iCalTimeZonePeriod (ActiveSync)
+
+- (void) _fillTZDate: (struct SYSTEMTIME *) tzData;
+
+@end
+
+@implementation iCalTimeZonePeriod (ActiveSync)
+
+//
+// FIXME - combine with iCalTimeZone+MAPIStore.m
+//
+- (void) _fillTZDate: (struct SYSTEMTIME *) tzData
+{
+  iCalRecurrenceRule *rrule;
+  NSArray *byMonth;
+  iCalByDayMask *mask;
+  NSCalendarDate *dateValue;
+
+  rrule = [self recurrenceRule];
+  byMonth = [rrule byMonth];
+  if ([byMonth count] > 0)
+    {
+      tzData->wMonth = [[byMonth objectAtIndex: 0] intValue];
+      mask = [rrule byDayMask];
+      tzData->wDayOfWeek = [mask firstDay];
+      tzData->wDay = [mask firstOccurrence];
+
+      dateValue = [self startDate];
+      tzData->wHour = [dateValue hourOfDay];
+      tzData->wMinute = [dateValue minuteOfHour];
+      tzData->wSecond = [dateValue secondOfMinute];
+    }
+}
+
+@end
+
+@implementation iCalTimeZone (ActiveSync)
+
+//
+// FIXME - combine with iCalTimeZone+MAPIStore.m
+//
+- (iCalTimeZonePeriod *) _mostRecentPeriodWithName: (NSString *) periodName
+{
+  NSArray *periods;
+  iCalTimeZonePeriod *period;
+  NSUInteger max;
+
+  periods = [self childrenWithTag: periodName];
+  max = [periods count];
+  if (max > 0)
+    {
+      periods = [periods sortedArrayUsingSelector: @selector (compare:)];
+      period = (iCalTimeZonePeriod *) [periods objectAtIndex: (max - 1)];
+    }
+  else
+    period = nil;
+
+  return period;
+}
+
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  iCalTimeZonePeriod *period;
+  NSMutableData *bytes;
+
+  uint32_t lBias;
+  uint32_t lStandardBias;
+  uint32_t lDaylightBias;
+  //uint16_t wStandardYear;
+  struct SYSTEMTIME stStandardDate;
+  //uint16_t wDaylightYear;
+  struct SYSTEMTIME stDaylightDate;
+
+  char standardName[64], daylightName[64];
+
+  bytes = [NSMutableData data];
+  
+  memset(standardName, 0, 64);
+  memset(daylightName, 0, 64);
+  lStandardBias = 0;
+
+  period = [self _mostRecentPeriodWithName: @"STANDARD"];
+  lBias = -[period secondsOffsetFromGMT] / 60;
+  [period _fillTZDate: &stStandardDate];
+
+  period = [self _mostRecentPeriodWithName: @"DAYLIGHT"];  
+  if (!period)
+    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];
+  [bytes appendBytes: standardName  length: 64];
+  [bytes appendBytes: &stStandardDate  length: 16];
+  [bytes appendBytes: &lStandardBias  length: 4];
+  [bytes appendBytes: daylightName  length: 64];
+  [bytes appendBytes: &stDaylightDate  length: 16];
+  [bytes appendBytes: &lDaylightBias  length: 4];
+  
+  return [bytes activeSyncRepresentationInContext: context];
+}
+
+@end
@@ -0,0 +1,46 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __ICALTODOACTIVESYNC_H__
+#define __ICALTODOACTIVESYNC_H__
+
+#import <NGCards/iCalToDo.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalToDo (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif
@@ -0,0 +1,192 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "iCalToDo+ActiveSync.h"
+
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
+
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalTimeZone.h>
+
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+@implementation iCalToDo (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+  id o;
+
+  int v;
+
+  s = [NSMutableString string];
+
+  // Complete
+  o = [self completed];
+  [s appendFormat: @"<Complete xmlns=\"Tasks:\">%d</Complete>", (o ? 1 : 0)];
+  
+  // DateCompleted
+  if (o)
+    [s appendFormat: @"<DateCompleted xmlns=\"Tasks:\">%@</DateCompleted>", [o activeSyncRepresentationInContext: context]];
+  
+  // Start date
+  if ((o = [self startDate]))
+    {
+      [s appendFormat: @"<StartDate xmlns=\"Tasks:\">%@</StartDate>", [o activeSyncRepresentationInContext: context]];
+      [s appendFormat: @"<UTCStartDate xmlns=\"Tasks:\">%@</UTCStartDate>", [o activeSyncRepresentationInContext: context]];
+    }
+
+  
+  // Due date
+  if ((o = [self due]))
+    {
+      [s appendFormat: @"<DueDate xmlns=\"Tasks:\">%@</DueDate>", [o activeSyncRepresentationInContext: context]];
+      [s appendFormat: @"<UTCDueDate xmlns=\"Tasks:\">%@</UTCDueDate>", [o activeSyncRepresentationInContext: context]];
+    }
+  
+  // Importance
+  o = [self priority];
+  if ([o isEqualToString: @"9"])
+    v = 0;
+  else if ([o isEqualToString: @"1"])
+    v = 2;
+  else
+    v = 1;
+  [s appendFormat: @"<Importance xmlns=\"Tasks:\">%d</Importance>", v];
+                    
+  // Reminder - FIXME
+  [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 0];
+  
+  // Sensitivity - FIXME
+  [s appendFormat: @"<Sensitivity xmlns=\"Tasks:\">%d</Sensitivity>", 0];
+  
+  // Subject
+  o = [self summary];
+  if ([o length])
+    [s appendFormat: @"<Subject xmlns=\"Tasks:\">%@</Subject>", [[self summary] activeSyncRepresentationInContext: context]];
+
+  if ((o = [self comment]))
+    {
+      o = [o activeSyncRepresentationInContext: context];
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1]; 
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Truncated>%d</Truncated>", 0];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
+    }
+  
+  return s;
+}
+
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  NSTimeZone *userTimeZone;
+  iCalTimeZone *tz;
+  id o;
+
+  NSInteger tzOffset;
+
+  userTimeZone = [[[context activeUser] userDefaults] timeZone];
+  tz = [iCalTimeZone timeZoneForName: [userTimeZone name]];
+  [(iCalCalendar *) parent addTimeZone: tz];
+  
+  // FIXME: merge with iCalEvent
+  if ((o = [theValues objectForKey: @"Subject"]))
+    [self setSummary: o];
+
+  // FIXME: merge with iCalEvent
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
+  
+  if ([[theValues objectForKey: @"Complete"] intValue] &&
+      ((o = [theValues objectForKey: @"DateCompleted"])) )
+    {
+      iCalDateTime *completed;
+      
+      o = [o calendarDate];
+      completed = (iCalDateTime *) [self uniqueChildWithTag: @"completed"];
+      //tzOffset = [[o timeZone] secondsFromGMTForDate: o];
+      //o = [o dateByAddingYears: 0 months: 0 days: 0
+      //                   hours: 0 minutes: 0
+      //                 seconds: -tzOffset];
+      [completed setDate: o];
+      [self setStatus: @"COMPLETED"];
+    }
+
+  if ((o = [theValues objectForKey: @"DueDate"]))
+    {
+      iCalDateTime *due;
+     
+
+      o = [o calendarDate];
+      due = (iCalDateTime *) [self uniqueChildWithTag: @"due"];
+      [due setTimeZone: tz];
+      
+      tzOffset = [userTimeZone secondsFromGMTForDate: o];
+      o = [o dateByAddingYears: 0 months: 0 days: 0
+                         hours: 0 minutes: 0
+                       seconds: tzOffset];
+      [due setDateTime: o];
+    }
+
+  // 2 == high, 1 == normal, 0 == low
+  if ((o = [theValues objectForKey: @"Importance"]))
+    {
+      if ([o intValue] == 2)
+        [self setPriority: @"1"];
+      else if ([o intValue] == 1)
+        [self setPriority: @"5"];
+      else
+        [self setPriority: @"9"];
+    }
+
+
+  if ((o = [theValues objectForKey: @"ReminderTime"]))
+    {
+
+    }
+}
+
+@end
@@ -0,0 +1,3 @@
+{
+  requires = ( MAIN, Appointments, Contacts, Mailer );
+}
@@ -0,0 +1,74 @@
+#
+#
+#   Keep only one of those vhost definition, comment out the other one
+#
+#
+
+# for https
+# don't forget to add a Listen parameter for port 8843:
+# Listen 8843
+<VirtualHost *:8843>
+  ServerName YOUR.SERVER.NAME
+
+  SSLEngine on
+
+  SSLProtocol -ALL +SSLv3 +TLSv1
+  SSLHonorCipherOrder On
+  SSLCipherSuite HIGH:MEDIUM:!ADH:!aNULL:!eNULL:!NULL
+  SSLCertificateFile    /path/to/your/cert/cert.pem
+  SSLCertificateChainFile /path/to/your/cert/cert-chain-file.pem
+  SSLCertificateKeyFile /path/to/your/key/file.key
+
+  RewriteEngine Off
+  ProxyRequests Off
+  SetEnv proxy-nokeepalive 1
+  ProxyPreserveHost On
+  ProxyPassInterpolateEnv On
+  ProxyPass /principals http://127.0.0.1:20000/SOGo/dav/ interpolate
+  ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
+  ProxyPass / http://127.0.0.1:20000/SOGo/dav/ interpolate
+  <Location />
+    Order allow,deny
+    Allow from all
+  </Location>
+
+  <Proxy http://127.0.0.1:20000>
+    RequestHeader set "x-webobjects-server-port" "8843"
+    RequestHeader set "x-webobjects-server-name" "CHANGETHIS:8843"
+    RequestHeader set "x-webobjects-server-url" "http://CHANGETHIS:8843"
+    RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
+    AddDefaultCharset UTF-8
+  </Proxy>
+
+  ErrorLog /var/log/apache2/ab-error.log
+  CustomLog /var/log/apache2/ab-access.log combined
+</VirtualHost>
+
+# plain http
+# Same here, don't forget to add a Listen parameter for port 8800:
+# Listen 8800
+<VirtualHost *:8800>
+  RewriteEngine Off
+  ProxyRequests Off
+  SetEnv proxy-nokeepalive 1
+  ProxyPreserveHost On
+  ProxyPassInterpolateEnv On
+  ProxyPass /principals http://127.0.0.1:20000/SOGo/dav/ interpolate
+  ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
+  ProxyPass / http://127.0.0.1:20000/SOGo/dav/ interpolate
+  <Location />
+    Order allow,deny
+    Allow from all
+  </Location>
+
+  <Proxy http://127.0.0.1:20000>
+    RequestHeader set "x-webobjects-server-port" "8800"
+    RequestHeader set "x-webobjects-server-name" "changethis:8800"
+    RequestHeader set "x-webobjects-server-url" "http://changethis:8800"
+    RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
+    AddDefaultCharset UTF-8
+  </Proxy>
+
+  ErrorLog /var/log/apache2/ab-error.log
+  CustomLog /var/log/apache2/ab-access.log combined
+</VirtualHost>
@@ -2,8 +2,6 @@ Alias /SOGo.woa/WebServerResources/ \
      /usr/lib/GNUstep/SOGo/WebServerResources/
 Alias /SOGo/WebServerResources/ \
      /usr/lib/GNUstep/SOGo/WebServerResources/
-AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
-           /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2

 <Directory /usr/lib/GNUstep/SOGo/>
    AllowOverride None
@@ -18,10 +16,6 @@ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
    </IfModule>
 </Directory>

-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*\.(jpg|png|gif|css|js)">
-  SetHandler default-handler
-</LocationMatch>
-
 ## Uncomment the following to enable proxy-side authentication, you will then
 ## need to set the "SOGoTrustProxyAuthentication" SOGo user default to YES and
 ## adjust the "x-webobjects-remote-user" proxy header in the "Proxy" section
@@ -48,6 +42,14 @@ ProxyPreserveHost On

 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.
+#
+#ProxyPass /Microsoft-Server-ActiveSync \
+# http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync \
+# retry=60 connectiontimeout=5 timeout=360
+
 <Proxy http://127.0.0.1:20000/SOGo>
 ## adjust the following to your configuration
  RequestHeader set "x-webobjects-server-port" "443"
@@ -59,7 +61,6 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 #  RequestHeader set "x-webobjects-remote-user" "%{REMOTE_USER}e"

  RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
-  RequestHeader set "x-webobjects-remote-host" %{REMOTE_HOST}e env=REMOTE_HOST

  AddDefaultCharset UTF-8

@@ -67,8 +68,9 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
  Allow from all
 </Proxy>

-## We use mod_rewrite to pass remote address to the SOGo proxy.
-# The remote address will appear in SOGo's log files and in the X-Forward
-# header of emails.
-RewriteEngine On
-RewriteRule ^/SOGo/(.*)$ /SOGo/$1 [env=REMOTE_HOST:%{REMOTE_ADDR},PT]
+# For Apple autoconfiguration
+<IfModule rewrite_module>
+  RewriteEngine On
+  RewriteRule ^/.well-known/caldav/?$ /SOGo/dav [R=301]
+</IfModule>
+
@@ -1,8 +1,6 @@
 /* SOGo+DAV.m - this file is part of SOGo
 *
- * Copyright (C) 2010 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2010-2013 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
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2005-2011 Inverse inc.
+  Copyright (C) 2005-2014 Inverse inc.
  Copyright (C) 2004-2005 SKYRIX Software AG

  This file is part of SOGo
@@ -1,4 +1,378 @@
-2.0.4 (2013-01-DD)
+2.2.4 (2014-05-29)
+------------------
+
+New features
+ - new print option in Calendar module
+ - now able to save unknown recipient emails to address book on send (#1496)
+
+Enhancements
+ - Sieve folder encoding is now configurable (#2622)
+ - SOGo version is now displayed in preferences window (#2612)
+ - report Sieve error when saving preferences (#1046)
+ - added the SOGoMaximumSyncWindowSize system default to overwrite the
+   maximum number of items returned during an ActiveSync sync operation
+ - updated datepicker
+ - addressbooks properties are now accessible from a popup window
+ - extended events and tasks searches
+ - updated Czech, French, Hungarian, Polish, Russian, Slovak, Spanish (Argentina), and Spanish (Spain) translations
+ - added more sycned contact properties when using ActiveSync (#2775)
+ - now possible to configure the default subscribed resource name using SOGoSubscriptionFolderFormat
+ - now handle server-side folder updates using ActiveSync (#2688)
+ - updated CKEditor to version 4.4.1
+
+Bug fixes
+ - fixed saved HTML content of draft when attaching a file
+ - fixed text nodes of HTML content handler by encoding HTML entities
+ - fixed iCal7 delegation issue with the "inbox" folder (#2489)
+ - fixed birth date validity checks (#1636)
+ - fixed URL handling (#2616)
+ - improved folder rename operations using ActiveSync (#2700)
+ - fixed SmartReply/Forward when ReplaceMime was omitted (#2680)
+ - fixed wrong generation of weekly repetitive events with ActiveSync (#2654)
+ - fixed incorrect XML data conversion with ActiveSync (#2695)
+ - fixed display of events having a category with HTML entities (#2703)
+ - fixed display of images in CSS background (#2437)
+ - fixed limitation of Sieve script size (#2745)
+ - fixed sync-token generation when no change was returned (#2492)
+ - fixed the IMAP copy/move operation between subfolders in different accounts
+ - fixed synchronization of seen/unseen status of msgs in Webmail (#2715)
+ - fixed focus of popup windows open through a contextual menu with Firefox on Windows 7
+ - fixed missing characters in shared folder names over ActiveSync (#2709)
+ - fixed reply and forward mail templates for Brazilian Portuguese (#2738)
+ - fixed newline in signature when forwarding a message as attachment in HTML mode (#2787)
+ - fixed restoration of options (priority & return receipt) when editing a draft (#193)
+ - fixed update of participation status via CalDAV (#2786)
+
+2.2.3 (2014-04-03)
+------------------
+
+Enhancements
+ - updated Dutch, Hungarian, Russian and Spanish (Argentina) translations
+ - initial support for ActiveSync event reminders support (#2681)
+ - updated CKEditor to version 4.3.4
+
+Bug fixes
+ - fixed possible exception when retrieving the default event reminder value on 64bit architectures (#2678)
+ - fixed calling unescapeHTML on null variables to avoid JavaScript exceptions in Contacts module
+ - fixed detection of IMAP flags support on the client side (#2664)
+ - fixed the ActiveSync issue marking all mails as read when downloading them
+ - fixed ActiveSync's move operations not working for multiple selections (#2691)
+ - fixed email validation regexp to allow gTLDs
+ - improved all-day events support for ActiveSync (#2686)
+
+2.2.2 (2014-03-21)
+------------------
+
+Enhancements
+ - updated French, Finnish, German and Spanish (Spain) translations
+ - added sanitization support for Outlook/ActiveSync to circumvent Outlook bugs (#2667)
+ - updated CKEditor to version 4.3.3
+ - updated jQuery File Upload to version 9.5.7
+
+Bug fixes
+ - fixed possible exception when retrieving the default event reminder value on 64bit architectures (#2647, #2648)
+ - disable file paste support in mail editor (#2641)
+ - fixed copying/moving messages to a mail folder begining with a digit (#2658)
+ - fixed unseen count for folders beginning with a digit and used in Sieve filters (#2652)
+ - fixed decoding of HTML entities in reminder alerts (#2659)
+ - fixed check for resource conflict when creating an event in the resource's calendar (#2541)
+ - fixed construction of mail folders tree
+ - fixed parsing of ORG attribute in cards (#2662)
+ - disabled ActiveSync provisioning for now (#2663)
+ - fixed messages move in Outlook which would create duplicates (#2650)
+ - fixed translations for OtherUsersFolderName and SharedFoldersName folders (#2657)
+ - fixed handling of accentuated characters when filtering contacts (#2656)
+ - fixed classification icon of events (#2651)
+ - fixed ActiveSync's SendMail with client version <= 12.1 (#2669)
+
+2.2.1 (2014-03-07)
+------------------
+
+Enhancements
+ - updated Czech, Dutch, Finnish, and Hungarian translations
+ - show current folder name in prompt dialog when renaming a mail folder
+
+Bug fixes
+ - fixed an issue with ActiveSync when the number of messages in the mailbox was greater than the window-size specified by the client
+ - fixed sogo-tool operations on Sieve script (#2617)
+ - fixed unsubscription when renaming an IMAP folder (#2630)
+ - fixed sorting of events list by calendar name (#2629)
+ - fixed wrong date format leading to Android email syncing issues (#2609)
+ - fixed possible exception when retrieving the default event reminder value (#2624)
+ - fixed encoding of mail folder name when creating a subfolder (#2637)
+ - fixed returned date format for email messages in ActiveSync
+ - fixed missing 'name part' in address for email messages in ActiveSync
+ - fixed race condition when syncing huge amount of deleted messages over ActiveSync
+ - fixed encoding of string as CSS identifier when the string starts with a digit
+ - fixed auto-completion popupmenu when UID is a digit
+
+2.2.0 (2014-02-24)
+------------------
+
+New features
+ - initial implementation of Microsoft ActiveSync protocol
+ - it's now possible to set a default reminder for calendar components
+   using SOGoCalendarDefaultReminder
+ - select multiple files to attach to a message or drag'n'drop files onto the
+   mail editor; will also now display progress of uploads
+ - new popup menu to download all attachments of a mail
+ - move & copy messages between different accounts
+ - support for the Sieve 'body' extension (mail filter based on the body content)
+
+Enhancements
+ - we now automatically convert <img src=data...> into file attachments
+   using CIDs to prevent Outlook issues
+ - updated French, Finnish, Polish, German, Russian, and Spanish (Spain) translations
+ - XMLHttpRequest.js is now loaded conditionaly (< IE9)
+ - format time in attendees invitation window according to the user's locale
+ - improved IE11 support
+ - respect signature placement when forwarding a message
+ - respect Sieve server capabilities
+ - encode messages in quoted-printable when content is bigger than 72 bytes
+ - we now use binary encoding in memcached (#2587)
+ - warn user when overbooking a resource by creating an event in its calendar (#2541)
+ - converted JavaScript alerts to inline CSS dialogs in appointment editor
+ - visually identify users with no freebusy information in autocompletion widget of attendees editor (#2565)
+ - respect occurences of recurrent events when deleting selected events (#1950)
+ - improved confirmation dialog box when deleting events and tasks
+ - moved the DN cache to SOGoCache - avoiding sogod restarts after RDN operations
+ - don't use the HTML editor with Internet Explorer 7
+ - add message-id header to appointment notifications (#2535)
+ - detect URLs in popup of events
+ - improved display of a contact (#2350)
+
+Bug fixes
+ - don't load 'background' attribute (#2437)
+ - fixed validation of subscribed folders (#2583)
+ - fixed display of folder names in messages filter editor (#2569)
+ - fixed contextual menu of the current calendar view (#2557)
+ - fixed handling of the '=' character in cards/events/tasks (#2505)
+ - simplify searches in the address book (#2187)
+ - warn user when dnd failed because of a resource conflict (#1613)
+ - respect the maximum number of bookings when viewing the freebusy information of a resource (#2560)
+ - encode HTML entities when forwarding an HTML message inline in plain text composition mode (#2411)
+ - encode HTML entities in JSON data (#2598)
+ - fixed handling of ACLs on shared calendars with multiple groups (#1854)
+ - fixed HTML formatting of appointment notifications for Outlook (#2233)
+ - replace slashes by dashes in filenames of attachments to avoid a 404 return code (#2537)
+ - avoid over-using LDAP connections when decomposing groups
+ - fixed display of a contact's birthday when not defined (#2503)
+ - fixed JavaScript error when switching views in calendar module (#2613)
+
+2.1.1b (2013-12-04)
+-------------------
+
+Enhancements
+ - updated CKEditor to version 4.3.0 and added tab module
+
+Bug fixes
+ - HTML formatting is now retained when forwarding/replying to a mail using the HTML editor
+ - put the text part before the HTML part when composing mail to fix a display issue with Thunderbird (#2512)
+
+2.1.1a (2013-11-22)
+-------------------
+
+Bug fixes
+ - fixed Sieve filters editor (#2504)
+ - moved missing translation to UI/Common (#2499)
+ - fixed potential crasher in OpenChange
+
+2.1.1 (2013-11-19)
+------------------
+
+New features
+ - creation and modification of mail labels
+
+Enhancements
+ - the color picker is no longer a popup window
+
+Bug fixes
+ - fixed utf8 character handling in special folder names
+   Special folder names can now be set as UTF8 or modified UTF7 in sogo.conf
+ - fixed reply-to header not being set for auxiliary IMAP accounts
+ - fixed handling of broken/invalid email addresses
+
+2.1.0 (2013-11-07)
+------------------
+
+Enhancements
+ - improved order of user rights in calendar module (#1431)
+ - increased height of alarm editor when email alarms are enabled
+ - added SMTP AUTH support for sogo-ealarms-notify
+ - added support for LDAP password change against AD/Samba4
+ - added Apache configuration for Apple autoconfiguration (#2248)
+ - the init scripts now start 3 sogod processes by default instead of 1
+ - SOGo now also sends a plain/text parts when sending HTML mails (#2217)
+ - SOGo now listens on 127.0.0.1:20000 by default (instead of *:20000)
+ - SOGo new uses the latest WebDAV sync response type (#1275)
+ - updated CKEditor to version 4.2.2 and added the tables-related modules (#2410)
+ - improved display of vEvents in messages
+
+Bug fixes
+ - fixed handling of an incomplete attachment filename (#2385)
+ - fixed Finnish mail reply/forward templates (#2401)
+ - fixed position of red line of current time (#2373)
+ - fixed crontab error (#2372)
+ - avoid using too many LDAP connections while looping through LDAP results
+ - don't encode HTML entities in mail subject of notification (#2402)
+ - fixed crash of Samba when sending an invitation (#2398)
+ - fixed selection of destination calendar when saving a task or an event (#2353)
+ - fixed "display remote images" preference for message in a popup (#2417)
+ - avoid crash when handling malformed or non-ASCII HTTP credentials (#2358)
+ - fixed crash in DAV free-busy lookups when using SQL addressbooks (#2418)
+ - disabled verbose logging of SMTP sessions by default
+ - fixed high CPU usage when there are no available child processes and added logging when such a condition occurs
+ - fixed memory consumption issues when doing dav lookups with huge result set
+ - fixed S/MIME verification issues with certain OpenSSL versions
+ - worked around an issue with chunked encoding of CAS replies (#2408)
+ - fixed OpenChange corruption issue regarding predecessors change list (#2405)
+ - avoid unnecessary UTF-7 conversions (#2318)
+ - improved RTF parser to fix vCards (#2354)
+ - fixed definition of the COMPLETED attribute of vTODO (#2240)
+ - fixed DAV:resource-id property when sharing calendars (#2399)
+ - fixed reload of multiple external web calendars (#2221)
+ - fixed display of PDF files sent from Thunderbird (#2270)
+ - fixed TLS support for IMAP (#2386)
+ - fixed creation of web calendar when added using sogo-tool (#2007)
+ - avoid crash when parsing HTML tags of a message (#2434)
+ - fixed handling of LDAP groups with no email address (#1328)
+ - fixed encoding of messages with non-ASCII characters (#2459)
+ - fixed compilation with clang 3.2 (#2235)
+ - truncated long fields of quick records to avoid an SQL error (#2461)
+ - fixed IMAP ACLs (#2433)
+ - removed inline JavaScript when viewing HTML messages (#2468)
+
+2.0.7 (2013-07-19)
+------------------
+
+New features
+ - print gridlines of calendar in 15-minute intervals
+ - allow the events/tasks lists to be collapsable
+ 
+Enhancements
+ - bubble box of events no longer overlaps the current event
+ - now pass the x-originating-ip using the IMAP ID extension (#2366)
+ - updated BrazilianPortuguese, Czech, Dutch, German, Polish and Russian translations
+
+Bug fixes
+ - properly handle RFC2231 everywhere
+ - fixed minor XSS issues 
+ - fixed jquery-ui not bluring the active element when clicking on a draggable
+
+2.0.6b (2013-06-27)
+------------------
+
+Bug fixes
+ - properly escape the foldername to avoid XSS issues
+ - fixed loading of MSExchangeFreeBusySOAPResponseMap
+
+2.0.6a (2013-06-25)
+------------------
+
+Bug fixes
+ - documentation fixes
+ - added missing file for CAS single logout
+
+2.0.6 (2013-06-21)
+------------------
+
+Enhancements
+ - updated CKEditor to version 4.1.1 (#2333)
+ - new failed login attemps rate-limiting options. See the new
+   SOGoMaximumFailedLoginCount, SOGoMaximumFailedLoginInterval and
+   SOGoFailedLoginBlockInterval defaults
+ - new message submissions rate-limiting options. See the new
+   SOGoMaximumMessageSubmissionCount, SOGoMaximumRecipientCount,
+   SOGoMaximumSubmissionInterval and SOGoMessageSubmissionBlockInterval defaults 
+ - now possible to send or not event notifications on a per-event basis
+ - now possible to see who created an event/task in a delegated calendar
+ - multi-domain support in OpenChange (implemented using a trick)
+
+Bug fixes
+ - fixed decoding of the charset parameter when using single quotes (#2306)
+ - fixed potential crash when sending MDN from Sent folder (#2209)
+ - fixed handling of unicode separators (#2309)
+ - fixed public access when SOGoTrustProxyAuthentication is used (#2237)
+ - fixed access right issues with import feature (#2294)
+ - fixed IMAP ACL issue when SOGoForceExternalLoginWithEmail is used (#2313)
+ - fixed handling of CAS logoutRequest (#2346)
+ - fixed many major OpenChange stability issues
+
+2.0.5a (2013-04-17)
+------------------
+
+Bug fixes
+ - fixed an issue when parsing user CN with leading or trailing spaces (#2287)
+ - fixed a crash that occured when saving contacts or tasks via Outlook
+
+2.0.5 (2013-04-11)
+------------------
+
+New features
+ - new system default SOGoEncryptionKey to be used to encrypt the passwords of
+   remote Web calendars when SOGoTrustProxyAuthentication is enabled
+ - activated the menu option "Mark Folder Read" in the Webmail (#1473)
+
+Enhancements
+ - added logging of the X-Forwarded-For HTTP header (#2229)
+ - now use BSON instead of GNUstep's binary format for serializing
+    Outlook related cache files
+ - updated Danish, Finnish, Polish and Slovak translations
+ - added Arabic translation - thanks to Anass Ahmed
+
+Bug fixes
+ - don't use the cache for password lookups from login page (#2169)
+ - fixed issue with exceptions in repeating events
+ - avoid data truncation issue in OpenChange with mysql backend
+   run sql-update-2.0.4b_to_2.0.5-mysql.sh to update existing tables
+ - avoid random crashes in OpenChange due to RTF conversion
+ - fixed issue when modifying/deleting exceptions of recurring events
+ - fixed major cache miss issue leading to slow Outlook resynchronizations
+ - fixed major memory corruption issue when Outlook was saving "messages"
+ - fixed filtering of sql contact entries when using dynamic domains (#2269)
+ - sogo.conf can now be used by all tools (#2226)
+ - SOPE: fixed handling of sieve capabilities after starttls (#2132)
+ - OpenChange: fixed 'stuck email' problem when sending a mail
+ - OpenChange NTLMAuthHandler: avoid tightloop when samba isn't available.
+ - OpenChange NTLMAuthHandler: avoid crash while parsing cookies
+ - OpenChange ocsmanager: a LOT of fixes, see git log
+
+
+2.0.4b (2013-02-04)
+------------------
+
+Bug fixes
+ - Fixed order of precedence for options (#2166)
+   The following order is enforced - first match wins
+     1. Command line arguments
+     2. .GNUstepDefaults
+     3. /etc/sogo/{debconf,sogo}.conf
+     4. SOGoDefaults.plist
+ - fixed handling of LDAP DN containing special characters (#2152, #2207)
+ - fixed handling of credential files for older GNUsteps (#2216)
+ - fixed display of messages with control characters (#2079, #2177)
+ - fixed tooltips in contacts list (#2211)
+ - fixed classification menu in component editor (#2223)
+ - fixed link to ACL editor for 'any authenticated user' (#2222, #2224)
+ - fixed saving preferences when mail module is disabled
+ - fixed handling for long credential strings (#2212)
+
+2.0.4a (2013-01-30)
+------------------
+
+Enhancements
+ - updated Czech translation
+ - birthday is now properly formatted in addressbook module
+
+Bug fixes
+ - fixed handling of groups with spaces in their UID
+ - fixed possible infinite loop in repeatable object
+ - fixed until date in component editor
+ - fixed saving all-day event in appointment editor
+ - fixed handling of decoding contacts UID
+ - fixed support of GNUstep 1.20 / Debian Squeeze
+
+2.0.4 (2013-01-25)
 ------------------

 New features
@@ -18,6 +392,7 @@ Enhancements
 - updated translations
 - recurrence-id of all-day events is now set as a proper date with no time
 - 'show completed tasks' is now persistent
+ - fixed memory usage consumption for remote ICS subscriptions

 Bug fixes
 - fixed usage of browser's language for the login page
@@ -76,7 +76,7 @@
    },
    {
      columnName = c_participants;
-      sqlType    = "VARCHAR(1000000)";
+      sqlType    = "TEXT";
      allowsNull = YES;
    },
    {
@@ -91,7 +91,7 @@
    },
    {
      columnName = c_cycleinfo;
-      sqlType    = "VARCHAR(1000000)";
+      sqlType    = "TEXT";
      allowsNull = YES;
    },
    {
@@ -126,7 +126,7 @@
    },
    {
      columnName = c_partmails;
-      sqlType    = "VARCHAR(100000)";
+      sqlType    = "TEXT";
      allowsNull = YES;
    },
    {
@@ -7,8 +7,6 @@ include ../Version

 BACKEND_VERSION = 1.0.0

-UNRTF_VERSION = 0.21.2
-
 ### bootstrap library
 MAPISTORESOGO = MAPIStoreSOGo
 LIBRARY_NAME = $(MAPISTORESOGO)
@@ -24,8 +22,6 @@ BUNDLE_NAME = $(SOGOBACKEND)
 BUNDLE_EXTENSION = .MAPIStore
 BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)

-UNRTF_DIR = unrtf-$(UNRTF_VERSION)
-
 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)
@@ -37,8 +33,6 @@ all::

 SAMBA_PRIVATE_DIR = $(shell $(PYTHON) ./samba-get-config.py "private dir")

-$(SOGOBACKEND)_SUBPROJECTS += $(UNRTF_DIR)/src
-
 $(SOGOBACKEND)_PRINCIPAL_CLASS = MAPIApplication

 $(SOGOBACKEND)_OBJC_FILES += \
@@ -52,11 +46,8 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreSamDBUtils.m \
 	MAPIStoreUserContext.m \
 	\
-	SOGoMAPIObject.m \
-	\
-	SOGoMAPIDBObject.m \
 	SOGoMAPIDBMessage.m \
-	SOGoMAPIDBFolder.m \
+	SOGoCacheGCSObject+MAPIStore.m \
 	\
 	MAPIStoreAppointmentWrapper.m \
 	MAPIStoreAttachment.m \
@@ -129,36 +120,11 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	iCalEvent+MAPIStore.m \
 	iCalTimeZone+MAPIStore.m \
 	\
-	GCSSpecialQueries+OpenChange.m\
-	\
-	EOQualifier+MAPI.m \
-	\
-	EOBitmaskQualifier.m
+	RTFHandler.m


 $(SOGOBACKEND)_RESOURCE_FILES += \
-	product.plist \
-	$(UNRTF_DIR)/charmaps/SYMBOL.charmap \
-	$(UNRTF_DIR)/outputs/html.conf
-
-### unrtf
-all:: $(UNRTF_DIR)/config.h $(UNRTF_DIR)/src/GNUmakefile
-
-$(UNRTF_DIR): $(UNRTF_DIR).tar.gz $(UNRTF_DIR).diff
-	@echo " Extracting and patching $(UNRTF_DIR)..."
-	@rm -rf $(UNRTF_DIR)
-	@$(TAR) -xvzf $< > /dev/null
-	@(cd $(UNRTF_DIR) && patch -p1 < ../$(UNRTF_DIR).diff) > /dev/null
-	@touch $(UNRTF_DIR)
-
-$(UNRTF_DIR)-stamp: $(UNRTF_DIR)
-	@touch $@
-
-$(UNRTF_DIR)/config.h: $(UNRTF_DIR)-stamp unrtf_config_h
-	@cp unrtf_config_h $(UNRTF_DIR)/config.h
-
-$(UNRTF_DIR)/src/GNUmakefile: $(UNRTF_DIR)-stamp GNUmakefile.unrtf
-	@cp GNUmakefile.unrtf $@
+	product.plist

 ### pl reader
 PLREADER_TOOL = plreader
@@ -210,7 +176,6 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-DSAMBA_PRIVATE_DIR=@"\"$(SAMBA_PRIVATE_DIR)\"" \
 	$(LIBMAPI_CFLAGS) \
 	$(LIBMAPISTORE_CFLAGS) \
-	-I$(UNRTF_DIR)/src \
 	-I../SoObjects -I../SOPE \
 	-DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" \
 	-DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\""
@@ -3,3 +3,6 @@ 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
@@ -1,34 +0,0 @@
-# -*-makefile-*-
-
-# GNUstep makefile
-
-include $(GNUSTEP_MAKEFILES)/common.make
-
-UNRTF = unrtf
-
-SUBPROJECT_NAME = $(UNRTF)
-
-$(UNRTF)_C_FILES = \
-	attr.c \
-	convert.c \
-	error.c \
-	hash.c \
-	malloc.c \
-	my_iconv.c \
-	output.c \
-	parse.c \
-	unicode.c \
-	user.c \
-	util.c \
-	word.c
-
-$(UNRTF)_CFLAGS = -DHAVE_CONFIG_H=1 -I. -I../
-
-# Option include to set any additional variables
-include GNUmakefile.preamble
-
-# Include in the rules for making libraries
-include $(GNUSTEP_MAKEFILES)/subproject.make
-
-# Option include to define any additional rules
-include GNUmakefile.postamble
@@ -161,7 +161,7 @@
  return [self getNo: data inMemCtx: memCtx];
 }

- (void) save
+- (void) save: (TALLOC_CTX *) memCtx
 {
 // (gdb) po embeddedMessage->properties
 // 2442592320 = "2012-07-11 22:30:00 +0000";
@@ -208,7 +208,8 @@

  [[container event] updateFromMAPIProperties: properties
                                inUserContext: [self userContext]
-                               withActiveUser: activeUser];
+                               withActiveUser: activeUser
+				     inMemCtx: memCtx];
 }

@end
@@ -63,7 +63,7 @@
  SOGoAppointmentObject *newEntry;
  NSString *name;

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

  name = [NSString stringWithFormat: @"%@.ics",
                   [SOGoObject globallyUniqueObjectId]];
@@ -200,6 +200,7 @@ static Class NSArrayK;

 - (void) dealloc
 {
+  //NSLog(@"MAPIStoreCalendarMessage: -dealloc (%p)", self);
  [calendar release];
  [super dealloc];
 }
@@ -417,7 +418,7 @@ static Class NSArrayK;
  return [self getYes: data inMemCtx: memCtx];
 }

- (NSString *) _uidFromGlobalObjectId
+- (NSString *) _uidFromGlobalObjectId: (TALLOC_CTX *) memCtx 
 {
  NSData *objectId;
  NSString *uid = nil;
@@ -431,7 +432,7 @@ static Class NSArrayK;
  if (objectId)
    {
      length = [objectId length];
-      bytesDup = talloc_array (NULL, char, length + 1);
+      bytesDup = talloc_array (memCtx, char, length + 1);
      memcpy (bytesDup, [objectId bytes], length);
      bytesDup[length] = 0;
      uidStart = bytesDup + length - 1;
@@ -596,7 +597,7 @@ static Class NSArrayK;
    }
 }

- (void) save
+- (void) save: (TALLOC_CTX *) memCtx 
 {
  // iCalCalendar *vCalendar;
  // NSCalendarDate *now;
@@ -608,7 +609,7 @@ static Class NSArrayK;

  if (isNew)
    {
-      uid = [self _uidFromGlobalObjectId];
+      uid = [self _uidFromGlobalObjectId: memCtx];
      if (uid)
        {
          /* Hack required because of what's explained in oxocal 3.1.4.7.1:
@@ -650,12 +651,12 @@ static Class NSArrayK;
  activeUser = [[self context] activeUser];
  [masterEvent updateFromMAPIProperties: properties
                          inUserContext: [self userContext]
-                         withActiveUser: activeUser];
+                         withActiveUser: activeUser
+	                       inMemCtx: memCtx];
  [self _updateAttachedEvents];
  [[self userContext] activateWithUser: activeUser];
  [sogoObject updateContentWithCalendar: calendar
                            fromRequest: nil];
-
  [self updateVersions];
 }

@@ -911,7 +911,7 @@ fromProperties: (NSDictionary *) attachmentProps
 //
 //
 //
- (void) save
+- (void) save:(TALLOC_CTX *) memCtx
 {
  NSArray *elements, *units;
  CardElement *element;
@@ -224,7 +224,7 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  NSURL *baseURL;
  int rc = MAPISTORE_ERR_NOT_FOUND;

-  NSLog (@"METHOD '%s' (%d) -- uri: '%s'", __FUNCTION__, __LINE__, newUri);
+  //NSLog (@"METHOD '%s' (%d) -- uri: '%s'", __FUNCTION__, __LINE__, newUri);

  context = nil;

@@ -532,8 +532,8 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  mappingId = [mapping idFromURL: childURL];
  if (mappingId == NSNotFound)
    {
-      [self warnWithFormat: @"no id exist yet for '%@', requesting one...",
-            childURL];
+      //[self warnWithFormat: @"no id exist yet for '%@', requesting one...",
+      //      childURL];
      openchangedb_get_new_folderID (connInfo->oc_ctx, &mappingId);
      [mapping registerURL: childURL withID: mappingId];
      contextId = 0;
@@ -1,8 +1,6 @@
 /* MAPIStoreDBBaseContext.m - this file is part of SOGo
 *
- * Copyright (C) 2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * 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
@@ -32,7 +30,7 @@
 #import "MAPIStoreDBFolder.h"
 #import "MAPIStoreMapping.h"
 #import "MAPIStoreUserContext.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>

 #import "MAPIStoreDBBaseContext.h"

@@ -60,7 +58,7 @@ static Class MAPIStoreDBFolderK;

 - (void) ensureContextFolder
 {
-  SOGoMAPIDBFolder *currentFolder;
+  SOGoCacheGCSFolder *currentFolder;
  NSArray *parts;
  NSMutableArray *folders;
  NSString *folderName;
@@ -78,7 +76,7 @@ static Class MAPIStoreDBFolderK;
      folderName = [parts objectAtIndex: count];
      if ([folderName length] > 0)
        {
-          currentFolder = [SOGoMAPIDBFolder objectWithName: folderName
+          currentFolder = [SOGoCacheGCSFolder objectWithName: folderName
                                               inContainer: currentFolder];
          [folders addObject: currentFolder];
        }
@@ -98,11 +96,11 @@ static Class MAPIStoreDBFolderK;

 - (id) rootSOGoFolder
 {
-  SOGoMAPIDBFolder *folder;
+  SOGoCacheGCSFolder *folder;

  [userContext ensureFolderTableExists];

-  folder = [SOGoMAPIDBFolder objectWithName: [isa MAPIModuleName]
+  folder = [SOGoCacheGCSFolder objectWithName: [isa MAPIModuleName]
                                inContainer: nil];
  [folder setTableUrl: [userContext folderTableURL]];
  // [folder reloadIfNeeded];
@@ -32,7 +32,7 @@
 #import <EOControl/EOQualifier.h>
 #import <SOGo/SOGoFolder.h>
 #import <SOGo/SOGoUser.h>
-#import "EOQualifier+MAPI.h"
+#import <SOGo/EOQualifier+SOGoCacheObject.h>
 #import "MAPIStoreContext.h"
 #import "MAPIStoreDBFolderTable.h"
 #import "MAPIStoreDBMessage.h"
@@ -40,7 +40,7 @@
 #import "MAPIStoreMapping.h"
 #import "MAPIStoreTypes.h"
 #import "MAPIStoreUserContext.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 #import "SOGoMAPIDBMessage.h"

 #import "MAPIStoreDBFolder.h"
@@ -49,7 +49,7 @@
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>

-static Class EOKeyValueQualifierK, SOGoMAPIDBFolderK, MAPIStoreDBFolderK;
+static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;

 static NSString *MAPIStoreRightReadItems = @"RightsReadItems";
 static NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
@@ -66,7 +66,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 + (void) initialize
 {
  EOKeyValueQualifierK = [EOKeyValueQualifier class];
-  SOGoMAPIDBFolderK = [SOGoMAPIDBFolder class];
+  SOGoCacheGCSFolderK = [SOGoCacheGCSFolder class];
  MAPIStoreDBFolderK = [MAPIStoreDBFolder class];
 }

@@ -92,7 +92,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 {
  enum mapistore_error rc;
  NSString *folderName, *nameInContainer;
-  SOGoMAPIDBFolder *newFolder;
+  SOGoCacheGCSFolder *newFolder;
  struct SPropValue *value;

  value = get_SPropValue_SRow (aRow, PidTagDisplayName);
@@ -111,7 +111,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
    {
      nameInContainer = [NSString stringWithFormat: @"0x%.16"PRIx64,
                                  (unsigned long long) newFID];
-      newFolder = [SOGoMAPIDBFolderK objectWithName: nameInContainer
+      newFolder = [SOGoCacheGCSFolderK objectWithName: nameInContainer
                                        inContainer: sogoObject];
      [newFolder reloadIfNeeded];
      [[newFolder properties] setObject: folderName
@@ -181,7 +181,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
                     [SOGoObject globallyUniqueObjectId]];
  fsObject = [SOGoMAPIDBMessage objectWithName: newKey
                                   inContainer: sogoObject];
-  [fsObject setObjectType: MAPIDBObjectTypeMessage];
+  [fsObject setObjectType: MAPIMessageCacheObject];
  [fsObject reloadIfNeeded];
  newMessage = [MAPIStoreDBMessage mapiStoreObjectWithSOGoObject: fsObject
                                                     inContainer: self];
@@ -198,7 +198,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
  ownerUser = [[self userContext] sogoUser];
  if ([[context activeUser] isEqual: ownerUser]
      || [self subscriberCanReadMessages])
-    keys = [(SOGoMAPIDBFolder *) sogoObject childKeysOfType: MAPIDBObjectTypeMessage
+    keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
                                             includeDeleted: NO
                                          matchingQualifier: qualifier
                                           andSortOrderings: sortOrderings];
@@ -211,7 +211,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 - (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
                         andSortOrderings: (NSArray *) sortOrderings
 {
-  return [dbFolder childKeysOfType: MAPIDBObjectTypeFolder
+  return [dbFolder childKeysOfType: MAPIFolderCacheObject
                    includeDeleted: NO
                 matchingQualifier: qualifier
                  andSortOrderings: sortOrderings];
@@ -236,7 +236,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
  messageKeys = [self messageKeys];

  date = [NSCalendarDate date];
-  [self logWithFormat: @"current date: %@", date];
+  //[self logWithFormat: @"current date: %@", date];

  max = [messageKeys count];
  for (count = 0; count < max; count++)
@@ -245,7 +245,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
      fileDate = [msg lastModificationTime];
      if ([date laterDate: fileDate] == fileDate)
        {
-          [self logWithFormat: @"current date: %@", date];
+          //[self logWithFormat: @"current date: %@", date];
          
          date = fileDate;
        }
@@ -23,6 +23,7 @@
 #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>

@@ -34,6 +35,7 @@
 #import "MAPIStoreDBMessage.h"
 #import "MAPIStoreTypes.h"
 #import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"

 #undef DEBUG
 #include <mapistore/mapistore.h>
@@ -99,6 +101,21 @@
  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
@@ -135,7 +152,7 @@
  [super addProperties: newNewProperties];
 }

- (void) save
+- (void) save: (TALLOC_CTX *) memCtx
 {
  uint64_t newVersion;

@@ -65,7 +65,7 @@ static Class MAPIStoreDBMessageK = Nil;
      cVersion = exchange_globcnt (([value unsignedLongLongValue] >> 16)
                                   & 0x0000ffffffffffffLL);
      version = [NSNumber numberWithUnsignedLongLong: cVersion];
-      [self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
+      //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
      [self logWithFormat: @"  version: %.16lx", cVersion];
      *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"version"
                                           operatorSelector: EOQualifierOperatorGreaterThanOrEqualTo
@@ -146,7 +146,7 @@ static Class MAPIStoreAttachmentK;
  return ULLONG_MAX;
 }

- (void) save
+- (void) save: (TALLOC_CTX *) memCtx
 {
  [self subclassResponsibility: _cmd];
 }
@@ -51,7 +51,7 @@
  return [self getYes: data inMemCtx: memCtx];
 }

- (enum mapistore_error) saveMessage
+- (enum mapistore_error) saveMessage: (TALLOC_CTX *) memCtx;
 {
  enum mapistore_error rc;
  MAPIStoreContext *context;
@@ -60,7 +60,7 @@
  context = [self context];
  ownerUser = [[self userContext] sogoUser];
  if ([[context activeUser] isEqual: ownerUser])
-    rc = [super saveMessage];
+    rc = [super saveMessage: memCtx];
  else
    rc = MAPISTORE_ERR_DENIED;

@@ -1,8 +1,6 @@
 /* MAPIStoreFallbackContext.m - this file is part of SOGo
 *
- * Copyright (C) 2011-2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * 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
@@ -26,7 +24,7 @@

 #import "MAPIStoreUserContext.h"
 #import "NSString+MAPIStore.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>

 #import "MAPIStoreFallbackContext.h"

@@ -51,7 +49,7 @@
                                                inMemCtx: (TALLOC_CTX *) memCtx
 {
  struct mapistore_contexts_list *firstContext = NULL, *context;
-  SOGoMAPIDBFolder *root;
+  SOGoCacheGCSFolder *root;
  NSArray *names;
  NSUInteger count, max;
  NSString *baseURL, *url, *name;
@@ -70,7 +68,7 @@

  /* Maybe emsmdbp_provisioning should be fixed in order to only take the uri
     returned above to avoid deleting its entries... */
-  root = [SOGoMAPIDBFolder objectWithName: [self MAPIModuleName]
+  root = [SOGoCacheGCSFolder objectWithName: [self MAPIModuleName]
                              inContainer: nil];
  [root setOwner: userName];
  userContext = [MAPIStoreUserContext userContextWithUsername: userName
@@ -1,8 +1,6 @@
 /* MAPIStoreFolder.h - this file is part of SOGo
 *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * 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
@@ -38,7 +36,7 @@
@class MAPIStoreMessageTable;
@class MAPIStorePermissionsTable;
@class SOGoFolder;
-@class SOGoMAPIDBFolder;
+@class SOGoCacheGCSFolder;
@class SOGoMAPIDBMessage;

 #import "MAPIStoreSOGoObject.h"
@@ -50,7 +48,7 @@
  // NSArray *faiMessageKeys;
  // NSArray *folderKeys;

-  SOGoMAPIDBFolder *dbFolder;
+  SOGoCacheGCSFolder *dbFolder;
  // SOGoMAPIDBFolder *faiFolder;
  // SOGoMAPIDBFolder *propsFolder;
  // SOGoMAPIDBMessage *propsMessage;
@@ -60,7 +58,7 @@

 - (void) setupAuxiliaryObjects;

- (SOGoMAPIDBFolder *) dbFolder;
+- (SOGoCacheGCSFolder *) dbFolder;

 - (NSArray *) activeMessageTables;
 - (NSArray *) activeFAIMessageTables;
@@ -1,8 +1,6 @@
 /* MAPIStoreFolder.m - this file is part of SOGo
 *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * 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
@@ -51,8 +49,9 @@
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 #import "SOGoMAPIDBMessage.h"
+#import "SOGoCacheGCSObject+MAPIStore.h"

 #include <gen_ndr/exchange.h>

@@ -120,7 +119,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  [userContext ensureFolderTableExists];

  ASSIGN (dbFolder,
-          [SOGoMAPIDBFolder objectWithName: folderName
+          [SOGoCacheGCSFolder objectWithName: folderName
                               inContainer: [container dbFolder]]);
  [dbFolder setTableUrl: [userContext folderTableURL]];
  if (!container && [path length] > 0)
@@ -138,7 +137,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  // ASSIGN (propsMessage,
  //         [SOGoMAPIDBMessage objectWithName: @"properties.plist"
  //                               inContainer: dbFolder]);
-  // [propsMessage setObjectType: MAPIDBObjectTypeInternal];
+  // [propsMessage setObjectType: MAPIInternalCacheObject];
  // [propsMessage reloadIfNeeded];
  [properties release];
  properties = [dbFolder properties];
@@ -180,7 +179,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe

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

  // [messageKeys release];
  // [faiMessageKeys release];
@@ -192,7 +191,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  [super dealloc];
 }

- (SOGoMAPIDBFolder *) dbFolder
+- (SOGoCacheGCSFolder *) dbFolder
 {
  return dbFolder;
 }
@@ -366,7 +365,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  MAPIStoreMapping *mapping;
  NSString *childURL;

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

  mapping = [self mapping];
  childURL = [mapping urlFromID: fid];
@@ -393,7 +392,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  MAPIStoreFolder *childFolder;
  SOGoUser *ownerUser;

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

  ownerUser = [[self userContext] sogoUser];
  if ([[context activeUser] isEqual: ownerUser]
@@ -450,8 +449,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  NSArray *keys;
  int rc = MAPISTORE_SUCCESS;

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

  if (tableType == MAPISTORE_MESSAGE_TABLE)
    keys = [self messageKeys];
@@ -513,8 +512,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  MAPIStoreMapping *mapping;
  SOGoUser *ownerUser;

-  [self logWithFormat: @"METHOD '%s' -- mid: 0x%.16llx  associated: %d",
-	__FUNCTION__, mid, isAssociated];
+  //[self logWithFormat: @"METHOD '%s' -- mid: 0x%.16llx  associated: %d",
+  //	__FUNCTION__, mid, isAssociated];

  context = [self context];
  ownerUser = [[self userContext] sogoUser];
@@ -699,7 +698,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
      if (rc != MAPISTORE_SUCCESS)
        goto end;
    }
-  [destMsg save];
+  [destMsg save: memCtx];
  if (!wantCopy)
    rc = [sourceFolder deleteMessageWithMID: srcMid andFlags: 0];

@@ -844,7 +843,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
                  [mapping registerURL: [targetMessage url]
                                withID: fmid];
                }
-              [targetMessage save];
+              [targetMessage save: memCtx];
            }
          [pool release];

@@ -865,7 +864,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
                  [mapping registerURL: [targetMessage url]
                                withID: fmid];
                }
-              [targetMessage save];
+              [targetMessage save: memCtx];
            }
          [pool release];

@@ -1221,7 +1220,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 - (NSArray *) faiMessageKeysMatchingQualifier: (EOQualifier *) qualifier
                             andSortOrderings: (NSArray *) sortOrderings
 {
-  return [dbFolder childKeysOfType: MAPIDBObjectTypeFAI
+  return [dbFolder childKeysOfType: MAPIFAICacheObject
                    includeDeleted: NO
                 matchingQualifier: qualifier
                  andSortOrderings: sortOrderings];
@@ -1531,7 +1530,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
  newKey = [NSString stringWithFormat: @"%@.plist",
                     [SOGoObject globallyUniqueObjectId]];
  dbObject = [SOGoMAPIDBMessage objectWithName: newKey inContainer: dbFolder];
-  [dbObject setObjectType: MAPIDBObjectTypeFAI];
+  [dbObject setObjectType: MAPIFAICacheObject];
  [dbObject setIsNew: YES];
  newMessage = [MAPIStoreFAIMessageK mapiStoreObjectWithSOGoObject: dbObject
                                                       inContainer: self];
@@ -122,6 +122,8 @@
  [MAPIApp setUserContext: userContext];
  moduleName = [self MAPIModuleName];
  parentFolder = [[userContext rootFolders] objectForKey: moduleName];
+  nameInContainer = nil;
+
  if (![parentFolder newFolderWithName: folderName
                       nameInContainer: &nameInContainer])
    mapistoreURI = [NSString stringWithFormat: @"sogo://%@@%@/%@/",
@@ -74,7 +74,7 @@ static Class NSNumberK;
  ASSIGN (versionsMessage,
          [SOGoMAPIDBMessage objectWithName: @"versions.plist"
                                inContainer: dbFolder]);
-  [versionsMessage setObjectType: MAPIDBObjectTypeInternal];
+  [versionsMessage setObjectType: MAPIInternalCacheObject];
 }

 - (void) dealloc
@@ -259,7 +259,6 @@ static Class NSNumberK;
  }
 }
 */
-
 - (void) _setChangeKey: (NSData *) changeKey
       forMessageEntry: (NSMutableDictionary *) messageEntry
      inChangeListOnly: (BOOL) inChangeListOnly
@@ -461,7 +460,10 @@ static Class NSNumberK;
              [mapping setObject: cLastModified forKey: changeNumber];
              [messageEntry setObject: changeNumber forKey: @"version"];

-              newChangeNum = [changeNumber unsignedLongValue];
+              newChangeNum = [changeNumber unsignedLongLongValue];
+	      
+	      // A GLOBCNT structure is a 6-byte global namespace counter,
+	      // we strip the first 2 bytes. The first two bytes is the ReplicaId
              changeKey = [self getReplicaKeyFromGlobCnt: newChangeNum >> 16];
              [self _setChangeKey: changeKey forMessageEntry: messageEntry
                 inChangeListOnly: NO];
@@ -92,8 +92,8 @@
      value = NSObjectFromMAPISPropValue (&res->lpProp);
      lastModified = [(MAPIStoreGCSFolder *)
                       container lastModifiedFromMessageChangeNumber: value];
-      [self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
-      [self logWithFormat: @"  c_lastmodified: %@", lastModified];
+      //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
+      //[self logWithFormat: @"  c_lastmodified: %@", lastModified];
      if (lastModified)
        {
          *qualifier = [[EOKeyValueQualifier alloc] initWithKey: @"c_lastmodified"
@@ -24,6 +24,7 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
+#import <NGImap4/NSString+Imap4.h>
 #import <NGExtensions/NSString+misc.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailFolder.h>
@@ -156,7 +157,7 @@ MakeDisplayFolderName (NSString *folderName)
      stringData = [NSString stringWithFormat: @"%@%@",
                             urlBase, [currentName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
      context->url = [stringData asUnicodeInMemCtx: context];
-      stringData = [[currentName substringFromIndex: 6] fromCSSIdentifier];
+      stringData = [[[currentName substringFromIndex: 6] fromCSSIdentifier] stringByDecodingImap4FolderName];
      context->name = [stringData asUnicodeInMemCtx: context];
      context->main_folder = false;
      context->role = MAPISTORE_MAIL_ROLE;
@@ -188,7 +189,7 @@ MakeDisplayFolderName (NSString *folderName)
  if ([newFolder create])
    mapistoreURI = [NSString stringWithFormat: @"sogo://%@:%@@mail/%@/",
                             userName, userName,
-                             [folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+                             [[folderName stringByEncodingImap4FolderName] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
  else
    mapistoreURI = nil;
  [MAPIApp setUserContext: nil];
@@ -1,8 +1,6 @@
 /* MAPIStoreMailFolder.m - this file is part of SOGo
 *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2011-2013 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
@@ -36,6 +34,7 @@
 #import <NGExtensions/NSString+misc.h>
 #import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Client.h>
+#import <NGImap4/NSString+Imap4.h>
 #import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
@@ -60,7 +59,7 @@
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "SOGoMAPIDBMessage.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>

 #import "MAPIStoreMailVolatileMessage.h"

@@ -107,7 +106,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
  ASSIGN (versionsMessage,
          [SOGoMAPIDBMessage objectWithName: @"versions.plist"
                                inContainer: dbFolder]);
-  [versionsMessage setObjectType: MAPIDBObjectTypeInternal];
+  [versionsMessage setObjectType: MAPIInternalCacheObject];
 }

 - (BOOL) ensureFolderExists
@@ -177,7 +176,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
  if (folderName)
    {
      nameInContainer = [NSString stringWithFormat: @"folder%@",
-                                  [folderName asCSSIdentifier]];
+                                  [[folderName stringByEncodingImap4FolderName] asCSSIdentifier]];
      newFolder = [SOGoMailFolderK objectWithName: nameInContainer
                                      inContainer: sogoObject];
      if ([newFolder create])
@@ -315,7 +314,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;

  if (![subfolderName hasPrefix: @"folder"])
    abort ();
-  strippedName = [subfolderName substringFromIndex: 6];
+  strippedName = [[subfolderName substringFromIndex: 6] stringByDecodingImap4FolderName];
  [representation appendFormat: @"/%@", strippedName];

  return representation;
@@ -390,7 +389,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
  else
    value = [NSDate date];

-  [self logWithFormat: @"lastMessageModificationTime: %@", value];
+  //[self logWithFormat: @"lastMessageModificationTime: %@", value];

  return value;
 }
@@ -613,8 +612,8 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
          [messageEntry setObject: modseq forKey: @"modseq"];
          [messageEntry setObject: changeNumber forKey: @"version"];

-          [self logWithFormat: @"added message entry for uid %@, modseq %@,"
-                @" version %@", uid, modseq, changeNumber];
+          //[self logWithFormat: @"added message entry for uid %@, modseq %@,"
+          //      @" version %@", uid, modseq, changeNumber];

          changeKey = [self getReplicaKeyFromGlobCnt: newChangeNum >> 16];
          [self _setChangeKey: changeKey forMessageEntry: messageEntry];
@@ -796,7 +795,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)

  if (tableType == MAPISTORE_MESSAGE_TABLE)
    {
-      changeNumber = [NSString stringWithUnsignedLongLong: changeNum];
+      changeNumber = [NSString stringWithFormat: @"0x%.16llx", changeNum];
      modseq = [[self modseqFromMessageChangeNumber: changeNumber]
                 unsignedLongLongValue];
      if (modseq > 0)
@@ -1173,9 +1172,9 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)

 - (MAPIStoreMessage *) createMessage
 {
-  SOGoMAPIObject *childObject;
+  SOGoCacheObject *childObject;

-  childObject = [SOGoMAPIObject objectWithName: [SOGoMAPIObject
+  childObject = [SOGoCacheObject objectWithName: [SOGoCacheObject
                                                  globallyUniqueObjectId]
                                   inContainer: sogoObject];
  return [MAPIStoreMailVolatileMessage
@@ -693,7 +693,15 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
  ngAddress = [[NGMailAddressParser mailAddressParserWithString: fullMail]
                parse];
  if ([ngAddress isKindOfClass: [NGMailAddress class]])
-    cn = [ngAddress displayName];
+    {
+      cn = [ngAddress displayName];
+      
+      // If we don't have a displayName, we use the email address instead. This
+      // avoid bug #2119 - where Outlook won't display anything in the "From" field,
+      // nor in the recipient field if we reply to the email.
+      if (![cn length])
+	cn = [ngAddress address];
+    }
  else
    cn = @"";

@@ -1576,7 +1584,7 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
  bodySetup = YES;
 }

- (void) save
+- (void) save: (TALLOC_CTX *) memCtx 
 {
  NSNumber *value;

@@ -120,7 +120,7 @@ static Class MAPIStoreMailMessageK, NSDataK, NSStringK;
    case PidLidAppointmentStartWhole:
    case PidLidAppointmentEndWhole:
    case PidLidRecurring:
-      [self logWithFormat: @"apt restriction on mail folder?"];
+      //[self logWithFormat: @"apt restriction on mail folder?"];
      rc = MAPIRestrictionStateAlwaysFalse;
      break;

@@ -155,10 +155,11 @@ static Class MAPIStoreMailMessageK, NSDataK, NSStringK;

    case PidTagChangeNumber:
      {
+        value = [NSString stringWithFormat: @"0x%.16llx", [value unsignedLongLongValue]];
        modseq = [(MAPIStoreMailFolder *)
                   container modseqFromMessageChangeNumber: value];
-        [self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
-        [self logWithFormat: @"  modseq: %.16lx", [modseq unsignedLongLongValue]];
+        //[self logWithFormat: @"change number from oxcfxics: %.16lx", [value unsignedLongLongValue]];
+        //[self logWithFormat: @"  modseq: %.16lx", [modseq unsignedLongLongValue]];
        if (modseq)
          modseq = [NSNumber numberWithUnsignedLongLong:
                               [modseq unsignedLongLongValue] + 1];
@@ -316,7 +317,7 @@ static Class MAPIStoreMailMessageK, NSDataK, NSStringK;
        ASSIGN (sortOrderings, newSortOrderings);
      else
        ASSIGN (sortOrderings, [NSArray arrayWithObject: @"ARRIVAL"]);
-      [self logWithFormat: @"new sort orderings: '%@'", sortOrderings];
+      //[self logWithFormat: @"new sort orderings: '%@'", sortOrderings];
    }
  else
    ASSIGN (sortOrderings, [NSArray arrayWithObject: @"ARRIVAL"]);
@@ -62,7 +62,7 @@
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
-#import "SOGoMAPIObject.h"
+#import <SOGo/SOGoCacheObject.h>

 #import "MAPIStoreMailVolatileMessage.h"

@@ -543,6 +543,7 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
  NSDictionary *recipients;
  NSUInteger type, bccLimit;
  SOGoUser *activeUser;
+  NSNumber *priority;

  activeUser
    = [SOGoUser
@@ -596,6 +597,21 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
      [headers addObject: [date rfc822DateString] forKey: @"date"];
    }
  [headers addObject: @"1.0" forKey: @"MIME-Version"];
+
+  priority = [mailProperties objectForKey: MAPIPropertyKey (PidTagImportance)];
+  
+  if ([priority intValue] == 2)
+    {
+      [headers addObject: @"1 (Highest)"  forKey: @"X-Priority"];
+    }
+  else if ([priority intValue] == 1)
+    {
+      [headers removeAllObjectsForKey: @"X-Priority"];
+    }
+  else
+    {
+      [headers addObject: @"5 (Lowest)"  forKey: @"X-Priority"];
+    }
 }

 static NSArray *
@@ -904,7 +920,7 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
  return MAPISTORE_SUCCESS;
 }

- (void) save
+- (void) save: (TALLOC_CTX *) memCtx
 {
  NSString *folderName, *flag, *newIdString, *messageKey;
  NSData *changeKey, *messageData;
@@ -943,7 +959,14 @@ MakeMessageBody (NSDictionary *mailProperties, NSDictionary *attachmentParts, NS
      [mapping registerURL: [self url] withID: mid];

      /* synchronise the cache and update the change key with the one provided
-         by the client */
+         by the client. Before doing this, lets issue a unselect/select combo 
+         because of timing issues with Dovecot in obtaining the latest modseq.
+         Sometimes, Dovecot doesn't return the newly appended UID if we do
+         a "UID SORT (DATE) UTF-8 (MODSEQ XYZ) (NOT DELETED)" command (where
+         XYZ is the HIGHESTMODSEQ+1) immediately after IMAP APPEND */
+      [client unselect];
+      [client select: folderName];
+
      [(MAPIStoreMailFolder *) container synchroniseCache];
      changeKey = [properties objectForKey: MAPIPropertyKey (PR_CHANGE_KEY)];
      if (changeKey)
@@ -64,7 +64,7 @@
 - (int) getAttachmentTable: (MAPIStoreAttachmentTable **) tablePtr
               andRowCount: (uint32_t *) countPtr;
 - (int) setReadFlag: (uint8_t) flag;
- (enum mapistore_error) saveMessage;
+- (enum mapistore_error) saveMessage: (TALLOC_CTX *) memCtx;

 - (NSArray *) activeContainerMessageTables;

@@ -74,7 +74,7 @@
 - (void) copyToMessage: (MAPIStoreMessage *) newMessage  inMemCtx: (TALLOC_CTX *) memCtx;

 /* subclasses */
- (void) save;
+- (void) save: (TALLOC_CTX *) memCtx;

 /* attachments (subclasses) */
 - (MAPIStoreAttachment *) createAttachment;
@@ -45,11 +45,10 @@
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
+#import "RTFHandler.h"

 #import "MAPIStoreMessage.h"

-#include <unrtf.h>
-
 #undef DEBUG
 #include <stdbool.h>
 #include <gen_ndr/exchange.h>
@@ -60,17 +59,6 @@ static Class MAPIStoreFolderK, MAPIStoreEmbeddedMessageK;

 static NSString *resourcesDir = nil;

-/* rtf conversion via unrtf */
-static int
-unrtf_data_output (void *data, const char *str, size_t str_len)
-{
-  NSMutableData *rtfData = data;
-
-  [rtfData appendBytes: str length: str_len];
-
-  return str_len;
-}
-
 static NSData *
 uncompressRTF (NSData *compressedRTF)
 {
@@ -97,22 +85,17 @@ rtf2html (NSData *compressedRTF)
 {
  NSData *rtf;
  NSMutableData *html = nil;
-  int rc;
-  struct unRTFOptions unrtfOptions;

  rtf = uncompressRTF (compressedRTF);
  if (rtf)
    {
-      html = [NSMutableData data];
-      memset (&unrtfOptions, 0, sizeof (struct unRTFOptions));
-      unrtf_set_output_device (&unrtfOptions, unrtf_data_output, html);
-      unrtfOptions.config_directory = [resourcesDir UTF8String];
-      unrtfOptions.output_format = "html";
-      unrtfOptions.nopict_mode = YES;
-      rc = unrtf_convert_from_string (&unrtfOptions,
-                                      [rtf bytes], [rtf length]);
-      if (!rc)
-        html = nil;
+      //html = [NSMutableData data];
+      RTFHandler *handler;
+
+      handler = [[RTFHandler alloc] initWithData: rtf];
+      AUTORELEASE(handler);
+
+      html = [handler parse];
    }

  return html;
@@ -139,7 +122,7 @@ rtf2html (NSData *compressedRTF)

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

  if ((self = [super init]))
    {
@@ -153,7 +136,7 @@ rtf2html (NSData *compressedRTF)

 - (void) dealloc
 {
-  [self logWithFormat: @"METHOD '%s' (%d) (%d)", __FUNCTION__, __LINE__, self];
+  //[self logWithFormat: @"METHOD '%s' (%d) (%d)", __FUNCTION__, __LINE__, self];
  [activeUserRoles release];
  [attachmentKeys release];
  [attachmentParts release];
@@ -260,7 +243,7 @@ rtf2html (NSData *compressedRTF)
  struct mapistore_message_recipient *recipient;
  NSUInteger count;

-  [self logWithFormat: @"METHOD '%s'", __FUNCTION__];
+  //[self logWithFormat: @"METHOD '%s'", __FUNCTION__];

  recipients = [NSMutableDictionary new];
  recipientProperties = [NSDictionary dictionaryWithObject: recipients
@@ -450,7 +433,7 @@ rtf2html (NSData *compressedRTF)
  NSString *key;
  MAPIStoreAttachment *attachment, *newAttachment;

-  [self logWithFormat: @"METHOD '%s' (%d) (%d)", __FUNCTION__, __LINE__, self];
+  //[self logWithFormat: @"METHOD '%s' (%d) (%d)", __FUNCTION__, __LINE__, self];
  
  //memCtx = talloc_zero (NULL, TALLOC_CTX);

@@ -477,7 +460,7 @@ rtf2html (NSData *compressedRTF)
  //talloc_free (memCtx);
 }

- (enum mapistore_error) saveMessage
+- (enum mapistore_error) saveMessage: (TALLOC_CTX *) memCtx
 {
  enum mapistore_error rc;
  NSArray *containerTables;
@@ -490,7 +473,7 @@ rtf2html (NSData *compressedRTF)
  BOOL userIsOwner;
  MAPIStoreMessage *mainMessage;

-  [self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];
+  //[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];
  
  context = [self context];
  ownerUser = [[self userContext] sogoUser];
@@ -518,7 +501,7 @@ rtf2html (NSData *compressedRTF)

          /* folder modified */
          notif_parameters
-            = talloc_zero(NULL, struct mapistore_object_notification_parameters);
+            = talloc_zero(memCtx, struct mapistore_object_notification_parameters);
          notif_parameters->object_id = folderId;
          if (isNew)
            {
@@ -542,7 +525,7 @@ rtf2html (NSData *compressedRTF)
          if (isNew)
            {
              notif_parameters
-                = talloc_zero(NULL,
+                = talloc_zero(memCtx,
                              struct mapistore_object_notification_parameters);
              notif_parameters->object_id = [self objectId];
              notif_parameters->folder_id = folderId;
@@ -562,7 +545,7 @@ rtf2html (NSData *compressedRTF)
            [[containerTables objectAtIndex: count] restrictedChildKeys];
        }
  
-      [self save];
+      [self save: memCtx];
      /* We make sure that any change-related properties are removes from the
         properties dictionary, to make sure that related methods will be
         invoked the next time they are requested. */
@@ -937,7 +920,7 @@ rtf2html (NSData *compressedRTF)
  return MAPISTORE_ERROR;
 }

- (void) save
+- (void) save: (TALLOC_CTX *) memCtx
 {
  [self subclassResponsibility: _cmd];
 }
@@ -284,6 +284,9 @@ static Class NSExceptionK, MAPIStoreFolderK;
  return MAPISTORE_SUCCESS;
 }

+//
+// The GlobCnt is 6 bytes long.
+//
 - (NSData *) getReplicaKeyFromGlobCnt: (uint64_t) objectCnt
 {
  struct mapistore_connection_info *connInfo;
@@ -68,7 +68,7 @@ sogo_backend_atexit (void)

  GSRegisterCurrentThread ();
  pool = [NSAutoreleasePool new];
-  NSLog (@"allocated classes:\n%s", GSDebugAllocationList (YES));
+  //NSLog (@"allocated classes:\n%s", GSDebugAllocationList (YES));
  [pool release];
  GSUnregisterCurrentThread ();
 }
@@ -1024,7 +1024,7 @@ sogo_message_set_read_flag (void *message_object, uint8_t flag)
 }

 static enum mapistore_error
-sogo_message_save (void *message_object)
+sogo_message_save (void *message_object, TALLOC_CTX *mem_ctx)
 {
  struct MAPIStoreTallocWrapper *wrapper;
  NSAutoreleasePool *pool;
@@ -1039,7 +1039,7 @@ sogo_message_save (void *message_object)
      message = wrapper->instance;
      GSRegisterCurrentThread ();
      pool = [NSAutoreleasePool new];
-      rc = [message saveMessage];
+      rc = [message saveMessage: mem_ctx];
      // [context tearDownRequest];
      [pool release];
      GSUnregisterCurrentThread ();
@@ -1229,7 +1229,7 @@ sogo_table_set_restrictions (void *table_object, struct mapi_SRestriction *restr
      GSRegisterCurrentThread ();
      pool = [NSAutoreleasePool new];
      [table setRestrictions: restrictions];
-      [table cleanupCaches];
+      //[table cleanupCaches];
      rc = MAPISTORE_SUCCESS;
      *table_status = TBLSTAT_COMPLETE;
      [pool release];
@@ -25,7 +25,7 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <EOControl/EOQualifier.h>

-#import "EOBitmaskQualifier.h"
+#import <SOGo/EOBitmaskQualifier.h>
 #import "MAPIStoreActiveTables.h"
 #import "MAPIStoreObject.h"
 #import "MAPIStoreTypes.h"
@@ -375,12 +375,12 @@ static Class NSDataK, NSStringK;

 - (void) setRestrictions: (const struct mapi_SRestriction *) res
 {
-  EOQualifier *oldRestriction;
+  //EOQualifier *oldRestriction;

  // [self logWithFormat: @"set restriction to (table type: %d): %@",
  // 	type, MAPIStringForRestriction (res)];

-  oldRestriction = restriction;
+  //oldRestriction = restriction;
  [restriction autorelease];
  if (res)
    restrictionState = [self evaluateRestriction: res
@@ -396,11 +396,11 @@ static Class NSDataK, NSStringK;
  // FIXME: we should not flush the caches if the restrictions matches
  [self cleanupCaches];
  
-  if (restriction)
-    [self logWithFormat: @"restriction set to EOQualifier: %@",
-	  restriction];
-  else if (oldRestriction)
-    [self logWithFormat: @"restriction unset (was %@)", oldRestriction];
+  //if (restriction)
+  //  [self logWithFormat: @"restriction set to EOQualifier: %@",
+//	  restriction];
+ // else if (oldRestriction)
+   // [self logWithFormat: @"restriction unset (was %@)", oldRestriction];
 }

 - (MAPIRestrictionState) evaluateNotRestriction: (struct mapi_SNotRestriction *) res
@@ -357,7 +357,7 @@
  return rc;
 }

- (void) save
+- (void) save:(TALLOC_CTX *) memCtx
 {
  iCalCalendar *vCalendar;
  iCalToDo *vToDo;
@@ -52,9 +52,9 @@ static inline NSNumber *
 MAPIPropertyKey (enum MAPITAGS propTag)
 {
 #if (GS_SIZEOF_LONG == 4)
-  return [NSNumber numberWithUnsignedLong: propTag];
+  return [NSString stringWithFormat: @"%ul", propTag];
 #elif (GS_SIZEOF_INT == 4)
-  return [NSNumber numberWithUnsignedInt: propTag];
+  return [NSString stringWithFormat: @"%u", propTag];
 #else
 #error No suitable type for 4 bytes integers
 #endif
@@ -342,7 +342,8 @@ MAPIStoreDumpMessageProperties (NSDictionary *properties)
 {
  NSNumber *key;
  NSArray *allKeys;
-  NSUInteger keyAsInt, count, max;
+  NSUInteger count, max;
+  NSUInteger keyAsInt;
  id value;

  allKeys = [properties allKeys];
@@ -351,7 +352,7 @@ MAPIStoreDumpMessageProperties (NSDictionary *properties)
  NSLog (@"message properties (%d):", max);

  value = [properties objectForKey: @"recipients"];
-  if (value)
+   if (value)
    NSLog (@"  recipients: %@", value);

  for (count = 0; count < max; count++)
@@ -363,7 +364,7 @@ MAPIStoreDumpMessageProperties (NSDictionary *properties)
          value = [properties objectForKey: key];
          NSLog (@"  0x%.4x: %@ (%@)",
                 keyAsInt, value,
-		 NSStringFromClass ([value class]));
+	  	 NSStringFromClass ([value class]));
        }
    }
 }
@@ -20,6 +20,7 @@
 * Boston, MA 02111-1307, USA.
 */

+#import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSMapTable.h>
@@ -41,7 +42,7 @@
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>

-#import "GCSSpecialQueries+OpenChange.h"
+#import <SOGo/GCSSpecialQueries+SOGoCacheObject.h>
 #import "MAPIApplication.h"
 #import "MAPIStoreAuthenticator.h"
 #import "MAPIStoreMapping.h"
@@ -107,15 +108,17 @@ static NSMapTable *contextsTable = nil;
  password = nil;
  
  path = [NSString stringWithFormat: SAMBA_PRIVATE_DIR
-		   @"/mapistore/%@/password", newUsername];
+                   @"/mapistore/%@/password", newUsername];

  content = [NSData dataWithContentsOfFile: path];

  if (content)
    {
      password = [[NSString alloc] initWithData: content
-				       encoding: NSUTF8StringEncoding];
+                                       encoding: NSUTF8StringEncoding];
      [password autorelease];
+      password = [password stringByTrimmingCharactersInSet:
+                  [NSCharacterSet characterSetWithCharactersInString: @"\r\n"]];
    }

  return password;
@@ -292,7 +295,7 @@ static NSMapTable *contextsTable = nil;
        {
          /* If "OCSFolderInfoURL" is properly configured, we must have 5
             parts in this url. */
-          ocFSTableName = [NSString stringWithFormat: @"socfs_%@",
+          ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@",
                                    [username asCSSIdentifier]];
          [parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
          folderTableURL
@@ -326,7 +329,7 @@ static NSMapTable *contextsTable = nil;
                  tableName]])
    {
      queries = [channel specialQueries];
-      query = [queries createOpenChangeFSTableWithName: tableName];
+      query = [queries createSOGoCacheGCSFolderTableWithName: tableName];
      if ([channel evaluateExpressionX: query])
        [NSException raise: @"MAPIStoreIOException"
                    format: @"could not create special table '%@'", tableName];
@@ -148,6 +148,7 @@ static void _fillFlatUIDWithGUID (struct FlatUID_r *flatUID, const struct GUID *
 - (struct XID *) asXIDInMemCtx: (void *) memCtx
 {
  struct XID *xid;
+  uint8_t *bytes;
  NSUInteger max;

  max = [self length];
@@ -158,7 +159,9 @@ static void _fillFlatUIDWithGUID (struct FlatUID_r *flatUID, const struct GUID *
      [self _extractGUID: &xid->GUID];

      xid->Size = max - 16;
-      xid->Data = talloc_memdup (xid, [self bytes] + 16, xid->Size);
+
+      bytes = (uint8_t *) [self bytes];
+      xid->Data = talloc_memdup (xid, (bytes+16), xid->Size);
    }
  else
    {
@@ -50,8 +50,7 @@ MAPIStoreTallocWrapperDestroy (void *data)
  GSRegisterCurrentThread ();
  pool = [NSAutoreleasePool new];
  wrapper = data;
-  //NSLog (@"destroying wrapped object (wrapper: %p; object: %p)...\n", wrapper, wrapper->MAPIStoreSOGoObject);
-  NSLog (@"destroying wrapped object (wrapper: %p)", wrapper);
+  //NSLog (@"destroying wrapped object (wrapper: %p; object: %p (%@))...\n", wrapper, wrapper->instance, NSStringFromClass([wrapper->instance class]));
  [wrapper->instance release];
  [pool release];
  GSUnregisterCurrentThread ();
@@ -67,8 +66,7 @@ MAPIStoreTallocWrapperDestroy (void *data)
  talloc_set_destructor ((void *) wrapper, MAPIStoreTallocWrapperDestroy);
  wrapper->instance = self;
  [self retain];
-  NSLog (@"returning wrapper: %p; object: %p", wrapper, self);
-
+  //NSLog (@"returning wrapper: %p; object: %p (%@)", wrapper, self, NSStringFromClass([self class]));
  return wrapper;
 }

@@ -1,8 +1,6 @@
 /* dbmsgdump.m - this file is part of SOGo
 *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * 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
@@ -33,6 +31,8 @@
 #import <Foundation/NSValue.h>
 #import <NGExtensions/NSNull+misc.h>

+#import <SOGo/BSONCodec.h>
+
 const char *indentationStep = "  ";

@interface NSObject (plext)
@@ -142,41 +142,43 @@ const char *indentationStep = "  ";
 static void
 OCDumpPListData (NSData *content)
 {
-  NSDictionary *d;
-  NSPropertyListFormat format;
-  NSString *error = nil;
-  const char *formatName;
+  //NSDictionary *d;
+  //NSPropertyListFormat format;
+  //NSString *error = nil;
+  //const char *formatName;

-  d = [NSPropertyListSerialization propertyListFromData: content
-                                       mutabilityOption: NSPropertyListImmutable
-                                                 format: &format
-                                       errorDescription: &error];
-  if (d)
-    {
-      switch (format)
-        {
-        case  NSPropertyListOpenStepFormat:
-          formatName = "OpenStep";
-          break;
-        case NSPropertyListXMLFormat_v1_0:
-          formatName = "XML";
-          break;
-        case NSPropertyListBinaryFormat_v1_0:
-          formatName = "Binary";
-          break;
-        case NSPropertyListGNUstepFormat:
-          formatName = "GNUstep";
-          break;
-        case NSPropertyListGNUstepBinaryFormat:
-          formatName = "GNUstep binary";
-          break;
-        default: formatName = "unknown";
-        }
+  //d = [NSPropertyListSerialization propertyListFromData: content
+  //                                     mutabilityOption: NSPropertyListImmutable
+  //                                               format: &format
+  //                                     errorDescription: &error];
+  //d = [content BSONValue];

-      printf ("File format is: %s\n", formatName);
-      [d displayWithIndentation: 0];
-      printf ("\n");
-    }
-  else
-    printf ("an error occurred: %s\n", [error UTF8String]);
+  // if (d)
+  //   {
+  //     switch (format)
+  //       {
+  //       case  NSPropertyListOpenStepFormat:
+  //         formatName = "OpenStep";
+  //         break;
+  //       case NSPropertyListXMLFormat_v1_0:
+  //         formatName = "XML";
+  //         break;
+  //       case NSPropertyListBinaryFormat_v1_0:
+  //         formatName = "Binary";
+  //         break;
+  //       case NSPropertyListGNUstepFormat:
+  //         formatName = "GNUstep";
+  //         break;
+  //       case NSPropertyListGNUstepBinaryFormat:
+  //         formatName = "GNUstep binary";
+  //         break;
+  //       default: formatName = "unknown";
+  //       }
+
+  //     printf ("File format is: %s\n", formatName);
+  //     [d displayWithIndentation: 0];
+  //     printf ("\n");
+  //   }
+  // else
+  //   printf ("an error occurred: %s\n", [error UTF8String]);
 }
@@ -0,0 +1,132 @@
+/*
+  Copyright (C) 2005-2012 Inverse inc.
+
+  This file is part of SOGo.
+
+  SOGo 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
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+
+#include <Foundation/NSArray.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSMapTable.h>
+#include <Foundation/NSObject.h>
+#include <Foundation/NSString.h>
+
+//
+//
+//
+@interface RTFHandler : NSObject
+{
+  NSMapTable *_charsets;
+  NSMutableData *_html;
+  NSData *_data;
+  
+  const char *_bytes;
+  int _current_pos;
+  int _len;
+}
+
+- (id) initWithData: (NSData *) theData;
+- (NSMutableData *) parse;
+@end
+
+//
+//
+//
+@interface RTFStack: NSObject
+{
+  NSMutableArray *a;
+}
+- (void) push: (id) theObject;
+- (id) pop;
+@end
+
+//
+//
+//
+@interface RTFFormattingOptions : NSObject
+{
+@public
+  BOOL bold;
+  BOOL italic;
+  BOOL underline;
+  BOOL strikethrough;
+  int font_index;
+  int color_index;
+  int start_pos;
+}
+@end
+
+//
+//
+//
+@interface RTFFontInfo : NSObject
+{
+@public
+  NSString *family;
+  NSString *charset;
+  NSString *name;
+  unsigned int pitch;
+  unsigned int index;
+}
+
+@end
+
+//
+// \fX - font, index in font table
+//
+@interface RTFFontTable : NSObject
+{
+  @public 
+  NSMapTable *fontInfos;
+}
+
+- (void) addFontInfo: (RTFFontInfo *) theFontInfo
+             atIndex: (unsigned int ) theIndex;
+  
+- (RTFFontInfo *) fontInfoAtIndex: (unsigned int ) theIndex;
+
+@end
+
+//
+//
+//
+@interface RTFColorDef : NSObject
+{
+@public
+  unsigned char red;
+  unsigned char green;
+  unsigned char blue;
+}
+
+@end
+
+//
+// {\colortbl\red0\green0\blue0;\red128\green0\blue0;\red255\green0\blue0;}
+//
+// \cfX - color/foreground - index
+// \cbX - color/background - index
+//
+//
+@interface RTFColorTable : NSObject
+{
+  @public
+  NSMutableArray *colorDefs;
+}
+
+- (void) addColorDef: (RTFColorDef *) theColorDef;
+
+@end
@@ -0,0 +1,961 @@
+/*
+  Copyright (C) 2005-2013 Inverse inc.
+
+  This file is part of SOGo.
+
+  SOGo 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
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+
+#include "RTFHandler.h"
+#include <Foundation/NSValue.h>
+
+//
+// Useful macros
+//
+#define ADVANCE _bytes++; _current_pos++;
+#define REWIND _bytes--; _current_pos--;
+
+
+//
+// Charset definitions. See http://msdn.microsoft.com/en-us/goglobal/bb964654 for all details.
+//
+const unsigned short ansicpg1250[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x201a, 0x0000, 0x201e, 0x2026, 0x2020, 0x2021, 0x0000, 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a, 
+    0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b, 
+    0x00b0, 0x00b1, 0x02db, 0x0142, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x0105, 0x015f, 0x00bb, 0x013d, 0x02dd, 0x013e, 0x017c, 
+    0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e, 
+    0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df, 
+    0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f, 
+    0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7, 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9 };
+
+const unsigned short ansicpg1251[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x0402, 0x0403, 0x201a, 0x0453, 0x201e, 0x2026, 0x2020, 0x2021, 0x20ac, 0x2030, 0x0409, 0x2039, 0x040a, 0x040c, 0x040b, 0x040f, 
+    0x0452, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0459, 0x203a, 0x045a, 0x045c, 0x045b, 0x045f, 
+    0x00a0, 0x040e, 0x045e, 0x0408, 0x00a4, 0x0490, 0x00a6, 0x00a7, 0x0401, 0x00a9, 0x0404, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x0407, 
+    0x00b0, 0x00b1, 0x0406, 0x0456, 0x0491, 0x00b5, 0x00b6, 0x00b7, 0x0451, 0x2116, 0x0454, 0x00bb, 0x0458, 0x0405, 0x0455, 0x0457, 
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, 
+    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, 
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, 0x043f, 
+    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, 0x044f };
+
+const unsigned short ansicpg1252[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017d, 0x0000, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x0000, 0x017e, 0x0178, 
+    0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
+    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 
+    0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
+    0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 
+    0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
+    0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff };
+
+const unsigned short ansicpg1253[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0000, 0x203a, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x00a0, 0x0385, 0x0386, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x0000, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x2015, 
+    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x0384, 0x00b5, 0x00b6, 0x00b7, 0x0388, 0x0389, 0x038a, 0x00bb, 0x038c, 0x00bd, 0x038e, 0x038f, 
+    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, 
+    0x03a0, 0x03a1, 0x0000, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9, 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03ae, 0x03af, 
+    0x03b0, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 
+    0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9, 0x03ca, 0x03cb, 0x03cc, 0x03cd, 0x03ce, 0x0000 };
+
+const unsigned short ansicpg1254[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x0000, 0x0000, 0x0178, 
+    0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
+    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 
+    0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
+    0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x0130, 0x015e, 0x00df, 
+    0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
+    0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f, 0x00ff };
+
+const unsigned short ansicpg1255[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0000, 0x203a, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20aa, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00d7, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
+    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00f7, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 
+    0x05b0, 0x05b1, 0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x0000, 0x05bb, 0x05bc, 0x05bd, 0x05be, 0x05bf, 
+    0x05c0, 0x05c1, 0x05c2, 0x05c3, 0x05f0, 0x05f1, 0x05f2, 0x05f3, 0x05f4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, 
+    0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, 0x05e8, 0x05e9, 0x05ea, 0x0000, 0x0000, 0x200e, 0x200f, 0x0000 };
+
+const unsigned short ansicpg1256[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x067e, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, 
+    0x06af, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x06a9, 0x2122, 0x0691, 0x203a, 0x0153, 0x200c, 0x200d, 0x06ba, 
+    0x00a0, 0x060c, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x06be, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
+    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x061b, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x061f, 
+    0x06c1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, 
+    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00d7, 0x0637, 0x0638, 0x0639, 0x063a, 0x0640, 0x0641, 0x0642, 0x0643, 
+    0x00e0, 0x0644, 0x00e2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x0649, 0x064a, 0x00ee, 0x00ef, 
+    0x064b, 0x064c, 0x064d, 0x064e, 0x00f4, 0x064f, 0x0650, 0x00f7, 0x0651, 0x00f9, 0x0652, 0x00fb, 0x00fc, 0x200e, 0x200f, 0x06d2 };
+
+const unsigned short ansicpg1257[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x201a, 0x0000, 0x201e, 0x2026, 0x2020, 0x2021, 0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00a8, 0x02c7, 0x00b8, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x0000, 0x2122, 0x0000, 0x203a, 0x0000, 0x00af, 0x02db, 0x0000, 
+    0x00a0, 0x0000, 0x00a2, 0x00a3, 0x00a4, 0x0000, 0x00a6, 0x00a7, 0x00d8, 0x00a9, 0x0156, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00c6, 
+    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00f8, 0x00b9, 0x0157, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00e6, 
+    0x0104, 0x012e, 0x0100, 0x0106, 0x00c4, 0x00c5, 0x0118, 0x0112, 0x010c, 0x00c9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012a, 0x013b, 
+    0x0160, 0x0143, 0x0145, 0x00d3, 0x014c, 0x00d5, 0x00d6, 0x00d7, 0x0172, 0x0141, 0x015a, 0x016a, 0x00dc, 0x017b, 0x017d, 0x00df, 
+    0x0105, 0x012f, 0x0101, 0x0107, 0x00e4, 0x00e5, 0x0119, 0x0113, 0x010d, 0x00e9, 0x017a, 0x0117, 0x0123, 0x0137, 0x012b, 0x013c, 
+    0x0161, 0x0144, 0x0146, 0x00f3, 0x014d, 0x00f5, 0x00f6, 0x00f7, 0x0173, 0x0142, 0x015b, 0x016b, 0x00fc, 0x017c, 0x017e, 0x02d9 };
+
+const unsigned short ansicpg1258[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0000, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0000, 0x203a, 0x0153, 0x0000, 0x0000, 0x0178, 
+    0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
+    0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 
+    0x00c0, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x0300, 0x00cd, 0x00ce, 0x00cf, 
+    0x0110, 0x00d1, 0x0309, 0x00d3, 0x00d4, 0x01a0, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x01af, 0x0303, 0x00df, 
+    0x00e0, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x0301, 0x00ed, 0x00ee, 0x00ef, 
+    0x0111, 0x00f1, 0x0323, 0x00f3, 0x00f4, 0x01a1, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x01b0, 0x20ab, 0x00ff };
+
+const unsigned short ansicpg874[256] = { 
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 
+    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 
+    0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 
+    0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 
+    0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, 
+    0x20ac, 0x0000, 0x0000, 0x0000, 0x0000, 0x2026, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x0000, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0x00a0, 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, 0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, 
+    0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, 0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, 
+    0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27, 0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, 
+    0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37, 0x0e38, 0x0e39, 0x0e3a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0e3f, 
+    0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0e4e, 0x0e4f, 
+    0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, 0x0e58, 0x0e59, 0x0e5a, 0x0e5b, 0x0000, 0x0000, 0x0000, 0x0000 };
+
+//
+//
+//
+@implementation RTFStack
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      a = [[NSMutableArray alloc] init];
+    }
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(a);
+  [super dealloc];
+}
+
+- (void) push: (id) theObject
+{
+  [a addObject: theObject];
+}
+
+- (id) pop
+{
+  id o = nil;
+  
+  if ([a count])
+    {
+      o = AUTORELEASE([[a lastObject] retain]);
+      [a removeLastObject];
+    }
+  
+  return o;
+}
+
+- (id) top
+{
+  id o = nil;
+
+  if ([a count])
+    {
+      o = AUTORELEASE([[a lastObject] retain]);
+    }
+
+  return o;
+}
+
+@end
+
+//
+//
+//
+@implementation RTFFormattingOptions
+@end
+
+//
+//
+//
+@implementation RTFFontInfo
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      
+    }
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(family);
+  RELEASE(charset);
+  RELEASE(name);
+  [super dealloc];
+}
+
+@end
+
+//
+//
+//
+@implementation RTFFontTable
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      fontInfos = NSCreateMapTable(NSObjectMapKeyCallBacks, NSObjectMapValueCallBacks, 128);
+    }
+  return self;
+}
+
+- (void) dealloc
+{
+  NSFreeMapTable(fontInfos);
+  [super dealloc];
+}
+
+- (void) addFontInfo: (RTFFontInfo *) theFontInfo
+             atIndex: (unsigned int) theIndex
+{
+  NSNumber *key;
+
+  key = [NSNumber numberWithInt: theIndex];
+  NSMapInsert(fontInfos, key, (void*) theFontInfo);
+}
+
+- (RTFFontInfo *) fontInfoAtIndex: (unsigned int) theIndex
+{
+  NSNumber *key;
+
+  key = [NSNumber numberWithInt: theIndex];
+  return NSMapGet(fontInfos, key);
+}
+
+@end
+
+//
+//
+//
+@implementation RTFColorDef
+
+@end
+
+//
+//
+//
+@implementation RTFColorTable
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      colorDefs = [[NSMutableArray alloc] init];
+    }
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(colorDefs);
+  [super dealloc];
+}
+
+- (void) addColorDef: (RTFColorDef *) theColorDef
+{
+  [colorDefs addObject: theColorDef];
+}
+
+- (RTFColorDef *) colorDefAtIndex: (unsigned int) theIndex
+{
+  return [colorDefs objectAtIndex: theIndex];
+}
+
+@end
+
+//
+//
+//
+@implementation RTFHandler
+
+- (id) initWithData: (NSData *) theData
+{
+  if ((self = [super init]))
+    {
+      ASSIGN(_data, theData);
+      _bytes = (char *)[_data bytes];
+      _len = [_data length];
+      _current_pos = 0;
+      
+      _charsets = NSCreateMapTable(NSObjectMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 10);
+      NSMapInsert(_charsets, @"ansicpg1250", ansicpg1250);
+      NSMapInsert(_charsets, @"ansicpg1251", ansicpg1251);
+      NSMapInsert(_charsets, @"ansicpg1252", ansicpg1252);
+      NSMapInsert(_charsets, @"ansicpg1253", ansicpg1253);
+      NSMapInsert(_charsets, @"ansicpg1254", ansicpg1254);
+      NSMapInsert(_charsets, @"ansicpg1255", ansicpg1255);
+      NSMapInsert(_charsets, @"ansicpg1256", ansicpg1256);
+      NSMapInsert(_charsets, @"ansicpg1257", ansicpg1257);
+      NSMapInsert(_charsets, @"ansicpg1258", ansicpg1258);
+      NSMapInsert(_charsets, @"ansicpg874", ansicpg874);
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  NSFreeMapTable(_charsets);
+  RELEASE(_data);
+  [super dealloc];
+}
+
+- (const char *) parseControlWord: (unsigned int *) len
+{
+  const char *start, *end;
+  
+  start = ADVANCE;
+  
+  while (isalnum(*_bytes) || *_bytes == '-')
+    {
+      ADVANCE;
+    }
+  end = _bytes;
+  
+  *len = end-start-1;
+  return start+1;
+}
+
+//
+// {\colortbl\red0\green0\blue0;\red128\green0\blue0;\red255\green0\blue0;}
+//
+- (RTFColorTable *) parseColorTable
+{
+  RTFColorTable *colorTable;
+  RTFColorDef *colorDef;
+
+  colorTable = [[[RTFColorTable alloc] init] autorelease];
+  colorDef = [[[RTFColorDef alloc] init] autorelease];
+
+  while (*_bytes != '}')
+    {
+      if (*_bytes == ';')
+        {
+          [colorTable addColorDef: colorDef];
+          colorDef = [[[RTFColorDef alloc] init] autorelease];
+          ADVANCE;
+        }
+      else if (*_bytes == '\\')
+        {
+          const char *cw;
+          unsigned int len;
+          NSString *s;
+          
+          cw = [self parseControlWord: &len];
+          
+          // Skip our control word
+          //if (strncmp(start+1, "colortbl", len) == 0)
+          //  continue;
+
+          s = [[NSString alloc] initWithBytesNoCopy: (void *)cw
+                                             length: len
+                                           encoding: NSASCIIStringEncoding
+                                       freeWhenDone: NO];
+          [s autorelease];
+
+          if ([s hasPrefix: @"red"])
+            {
+              colorDef->red = [[s substringFromIndex: 3] intValue];
+            }
+          else if ([s hasPrefix: @"green"])
+            {
+              colorDef->green = [[s substringFromIndex: 4] intValue];
+            }
+          else
+            {
+              colorDef->blue = [[s substringFromIndex: 4] intValue];
+            }
+        }
+      else
+        {
+          ADVANCE;
+        }
+      
+    }
+
+  return colorTable;
+}
+
+//
+// Possible formats:
+// 
+// {\fonttbl\f0\fswiss Helvetica;}
+// {\fonttbl{\f0\froman\fcharset0\fprq2 Arial;}{\f1\fswiss\fprq2\fcharset0 Arial;}}
+//
+// FIXME: Complex ones not handled right now:
+//
+// {\fonttbl{\f2\fnil\fcharset256\fprq2{\*\panose 00020703090202050204}Courier New;}{...
+// {\fonttbl{\f31\fnil\fcharset0\fprq0 Times New Roman Monotype{\*\falt Times New Roman};}{...
+//
+// We receive the full string.
+//
+- (RTFFontTable *) parseFontTable
+{
+  NSMutableString *fontName;
+  RTFFontTable *fontTable;
+  RTFFontInfo *fontInfo;
+
+  unsigned int count;
+
+  fontTable = [[[RTFFontTable alloc] init] autorelease];
+  fontName = nil;
+  count = 0;
+ 
+  do
+    {
+      if (*_bytes == '{')
+        {
+          if (fontTable)
+            {
+              fontInfo = [[[RTFFontInfo alloc] init] autorelease];
+              fontName = [[[NSMutableString alloc] init] autorelease];
+            }
+          ADVANCE;
+          count++;
+        }
+      else if (*_bytes == '}')
+        {
+          if (fontTable) //&& ![NSAllMapTableValues(fontTable->fontInfos) containsObject: fontInfo])
+            {
+              ASSIGN(fontInfo->name, fontName);
+              [fontTable addFontInfo: fontInfo  atIndex: fontInfo->index];
+            }
+          ADVANCE;
+          count--;
+        }
+      else if (*_bytes == '\\')
+        {
+          const char *cw;
+          unsigned int len;
+          NSString *s;
+          
+          cw = [self parseControlWord: &len];
+          
+          // Skip our control word
+          if (strncmp((const char*)cw, "fonttbl", len) == 0)
+            continue;
+            
+          // We must at least parse <fontnum><fontfamily><fcharset>
+          s = [[NSString alloc] initWithBytesNoCopy: (void *)cw+1
+                                             length: len-1
+                                           encoding: NSASCIIStringEncoding
+                                       freeWhenDone: NO];
+          [s autorelease];
+
+          // If we got a fontnum, let's parse all three fields at once)
+          if (isdigit(*(cw+1)))
+            {
+              fontInfo->index = [s intValue];
+              
+              // We now parse <fontfamily><fcharset>
+              cw = [self parseControlWord: &len];
+              fontInfo->family = [[NSString alloc] initWithBytesNoCopy: (void *)cw+1
+                                                                length: len-1
+                                                              encoding: NSASCIIStringEncoding
+                                                          freeWhenDone: NO];
+
+              cw = [self parseControlWord: &len];
+              fontInfo->charset = [[NSString alloc] initWithBytesNoCopy: (void *)cw+1
+                                                                 length: len-1
+                                                               encoding: NSASCIIStringEncoding
+                                                           freeWhenDone: NO];
+
+              // We now skip everything until we find our final group closer ('}')
+              int cc = 1;
+              
+              do
+                {
+                  if (*_bytes == '{')
+                    cc++;
+                  if (*_bytes == '}')
+                    cc--;
+                  
+                  ADVANCE;
+                }
+              while (cc != 0);
+
+              // move back our buffer;
+              REWIND;
+            }
+        }
+      else
+        {
+          if (isalnum(*_bytes))
+            [fontName appendFormat: @"%c", *_bytes]; 
+          ADVANCE;
+       }
+    } while (count != 0);
+
+  return fontTable;
+}
+
+//
+//
+//
+- (void) parseStyleSheet
+{
+  unsigned int count;
+
+  count = 0;
+
+  do
+   {
+     if (*_bytes == '{')
+        {
+           count++;
+        }
+     else if (*_bytes == '}')
+        {
+           count--;
+        }
+     ADVANCE;    
+
+   } while (count != 0); 
+}
+
+//
+//
+//
+- (void) parsePicture
+{
+  // Do the same as -parseStyleSheet for now, that is, ignore everything.
+  [self parseStyleSheet];
+}
+
+//
+//
+//
+- (NSMutableData *) parse
+{
+  RTFFormattingOptions *formattingOptions;
+  RTFColorTable *colorTable;
+  RTFFontTable *fontTable;
+  RTFStack *stack;
+  
+  unsigned short *charset;
+  char c;
+  
+  stack = [[RTFStack alloc] init];
+  fontTable = nil;
+  colorTable = nil;
+  charset = NULL;
+
+  _html = [[NSMutableData alloc] init];
+  [_html appendBytes: "<html><meta charset='utf-8'><body>"  length: 34];
+
+  
+
+  // Check if we got RTF data
+  if (_len > 4 && strncmp((const char*)_bytes, "{\\rtf", 4) != 0)
+    return NO;
+
+  while (_current_pos < _len)
+    {
+      c = *_bytes;
+
+      // RTF control code
+      if (c == '\\')
+        {
+          unsigned int len;
+          const char *cw;
+          NSString *s;
+
+          if (*(_bytes+1) == '\'' && charset)
+            {
+              // A hexadecimal value, based on the specified character set (may be used to identify 8-bit values).
+              NSString *s;
+              NSData *d;
+              
+              const char *b1, *b2;
+              unsigned short index;
+              
+              ADVANCE;
+              ADVANCE;
+
+              b1 = ADVANCE;
+              b2 = ADVANCE;
+              
+              index = (isdigit(*b1) ? *b1 - 48 : toupper(*b1) - 55) * 16;
+              index += (isdigit(*b2) ? *b2 - 48 : toupper(*b2) - 55);
+              
+              s = [NSString stringWithCharacters: &(charset[index])  length: 1];
+              d = [s dataUsingEncoding: NSUTF8StringEncoding];
+              [_html appendData: d];
+              continue;
+            }
+          else if (*(_bytes+1) == '*')
+            {
+	      int cc = 1;
+	      
+	      do
+                {
+                  if (*_bytes == '{')
+                    cc++;
+                  if (*_bytes == '}')
+                    cc--;
+                  
+                  ADVANCE;
+                }
+              while (cc != 0);
+
+              continue;
+            }
+
+          cw = [self parseControlWord: &len];
+
+          s = [[NSString alloc] initWithBytesNoCopy: (void *)cw
+                                             length: len
+                                           encoding: NSASCIIStringEncoding
+                                       freeWhenDone: NO];
+          [s autorelease];
+
+          if (strncmp(cw, "ansicpg", 7) == 0)
+            {
+              charset = NSMapGet(_charsets, s);
+            }
+          else if (strncmp(cw, "fonttbl", 7) == 0)
+            {
+              // We rewind our buffer so we start at the beginning of {\fonttbl...
+              _bytes = cw-2;
+              _current_pos -= 10;
+              fontTable = [self parseFontTable];
+              
+              // We go back 1 byte in order to end our section properly ('}' character
+              REWIND;
+            }
+          else if (strncmp(cw, "stylesheet", 10) == 0)
+  	     {
+               _bytes = cw-2;
+               _current_pos -= 13;
+               [self parseStyleSheet];
+               REWIND;
+             } 
+           else if (strncmp(cw, "colortbl", 8) == 0)
+             {
+               colorTable = [self parseColorTable];
+             }
+           else if (strncmp(cw, "pict", 4) == 0)
+             {
+               _bytes = cw-2;
+               _current_pos -= 7;
+               [self parsePicture];
+               REWIND;
+             }
+           else if ([s isEqualToString: @"b"] && formattingOptions)
+             {
+               [_html appendBytes: "<b>"  length: 3];
+              formattingOptions->bold = YES;
+            }
+          else if ([s isEqualToString: @"b0"] && formattingOptions)
+            {
+              [_html appendBytes: "</b>"  length: 4];
+              formattingOptions->bold = NO;
+            }
+          else if ([s hasPrefix: @"cf"] && [s length] > 2)
+            {
+              RTFColorDef *colorDef;
+              int color_index;
+              char *v;
+
+              color_index = [[s substringFromIndex: 2] intValue];
+             
+ 	      if (!formattingOptions)
+		continue;
+ 
+              if (formattingOptions->color_index >= 0) // && color_index != formattingOptions->color_index)
+                {
+                  [_html appendBytes: "</font>"  length: 7];
+                }
+              
+              formattingOptions->color_index = color_index;              
+              colorDef = [colorTable colorDefAtIndex: color_index];
+              
+              v = malloc(23*sizeof(char));
+              memset(v, 0, 23);
+              sprintf(v, "<font color=\"#%02x%02x%02x\">", colorDef->red, colorDef->green, colorDef->blue);
+              [_html appendBytes: v  length: strlen(v)];
+              free(v);
+            }
+          else if ([s hasPrefix: @"fcs"])
+            {
+              // ignore
+            }
+          else if ([s hasPrefix: @"fs"])
+            {
+              // ignore
+            }
+          else if ([s hasPrefix: @"fbidis"])
+            {
+              // ignore
+            }
+          else if ([s hasPrefix: @"fromhtml"])
+            {
+              // ignore
+            }
+         else if ([s hasPrefix: @"fromtext"])
+            {
+              // ignore
+            }
+          else if ([s hasPrefix: @"f"] && [s length] > 1)
+            {
+              RTFFontInfo *fontInfo;
+              int font_index;
+
+              font_index = [[s substringFromIndex: 1] intValue];
+
+              if (!formattingOptions)
+                continue;
+              
+              if (formattingOptions->font_index >= 0 &&
+                  font_index != formattingOptions->font_index)
+                {
+                  [_html appendBytes: "</font>"  length: 7];
+                }
+              
+              formattingOptions->font_index = font_index;
+
+              fontInfo = [fontTable fontInfoAtIndex: font_index];
+
+              char *v = malloc(128*sizeof(char));
+              memset(v, 0, 128);
+              sprintf(v, "<font face=\"%s\">", [fontInfo->name UTF8String]);
+              [_html appendBytes: v  length: strlen(v)];
+              free(v);
+            }
+          else if ([s isEqualToString: @"i"] && formattingOptions)
+            {
+              [_html appendBytes: "<i>"  length: 3];
+              formattingOptions->italic = YES;
+            }
+          else if ([s isEqualToString: @"i0"] && formattingOptions)
+            {
+              [_html appendBytes: "</i>"  length: 4];
+              formattingOptions->italic = NO;
+            }
+          else if ([s isEqualToString: @"tab"])
+            {
+              [_html appendBytes: "&nbsp;&nbsp;"  length: 12];
+            }
+          else if ([s isEqualToString: @"softline"] || [s isEqualToString: @"par"])
+            {
+              [_html appendBytes: "<br>"  length: 4];
+            }
+         else if ([s isEqualToString: @"strike"] && formattingOptions)
+            {
+              [_html appendBytes: "<strike>"  length: 8];
+              formattingOptions->strikethrough = YES;
+            }
+          else if ([s isEqualToString: @"strike0"] && formattingOptions)
+            {
+              [_html appendBytes: "</strike>"  length: 9];
+              formattingOptions->strikethrough = NO;
+            }
+          else if ([s hasPrefix: @"u"] && [s length] > 1 && isdigit([s characterAtIndex: 1]))
+            {
+              NSData *d;
+              unichar ch;
+
+              ch = (unichar)[[s substringFromIndex: 1] intValue];
+              s = [NSString stringWithCharacters: &ch length: 1];
+              d = [s dataUsingEncoding: NSUTF8StringEncoding];
+              [_html appendData: d];
+            }
+          else if ([s isEqualToString: @"ul"] && formattingOptions)
+            {
+              [_html appendBytes: "<u>"  length: 3];
+              formattingOptions->underline = YES;
+            }
+          else if (([s isEqualToString: @"ul0"] || [s isEqualToString: @"ulnone"]) 
+                   && formattingOptions)
+            {
+              [_html appendBytes: "</u>"  length: 4];
+              formattingOptions->underline = NO;
+            }
+
+          // If a space delimits the control word, the space does not appear in the document.
+          // Any characters following the delimiter, including spaces, will appear in the document.
+          if (*_bytes == ' ')
+            {
+              ADVANCE;
+            }
+        }
+      else if (c == '{')
+        {
+          formattingOptions = [[[RTFFormattingOptions alloc] init] autorelease];
+
+          formattingOptions->bold = NO;
+          formattingOptions->italic = NO;
+          formattingOptions->strikethrough = NO;
+          formattingOptions->underline = NO;
+          formattingOptions->font_index = -1;
+          formattingOptions->color_index = -1;
+          formattingOptions->start_pos = [_html length];
+          [stack push: formattingOptions];
+          ADVANCE;
+        }
+      else if (c == '}')
+        {
+          formattingOptions = [stack pop];
+
+          if (formattingOptions)
+            {
+              // Handle {\b bold} vs. \b bold \b0
+              if (formattingOptions->bold)
+                {
+                  [_html appendBytes: "</b>"  length: 4];
+                }
+              
+              if (formattingOptions->italic)
+                {
+                  [_html appendBytes: "</i>"  length: 4];
+                }
+              
+              if (formattingOptions->strikethrough)
+                {
+                  [_html appendBytes: "</strike>"  length: 9];
+                }
+              
+              if (formattingOptions->underline)
+                {
+                  [_html appendBytes: "</u>"  length: 4];
+                }
+              
+              if (formattingOptions->font_index >= 0)
+                {
+                  [_html appendBytes: "</font>"  length: 7];
+                }
+              
+              if (formattingOptions->color_index >= 0)
+                {
+                  [_html appendBytes: "</font>"  length: 7];
+                }
+            }
+          
+          formattingOptions = [stack top];
+          ADVANCE;
+        }
+      else
+        {
+          // We avoid appending NULL bytes
+          if (*_bytes)
+            [_html appendBytes: _bytes  length: 1];
+          ADVANCE;
+        }
+    }
+  
+  [_html appendBytes: "</body></html>"  length: 14];
+  
+  RELEASE(stack);
+  return AUTORELEASE(_html);
+}
+
+@end
@@ -0,0 +1,32 @@
+/* SOGoCacheGCSObject+MAPIStore.h - this file is part of SOGo
+ *
+ * Copyright (C) 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.
+ */
+
+#ifndef SOGOCACHEGCSOBJECTMAPISTORE
+#define SOGOCACHEGCSOBJECTMAPISTORE
+
+#include <SOGo/SOGoCacheGCSObject.h>
+
+@interface SOGoCacheGCSObject (MAPIStore)
+
+- (Class) mapistoreMessageClass;
+
+@end
+
+#endif // SOGOCACHEGCSOBJECTMAPISTORE
@@ -0,0 +1,68 @@
+/* SOGoCacheGCSObject+MAPIStore.m - this file is part of SOGo
+ *
+ * Copyright (C) 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/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+
+#include "MAPIStoreTypes.h"
+
+#include "SOGoCacheGCSObject+MAPIStore.h"
+
+@implementation SOGoCacheGCSObject (MAPIStore)
+
+- (Class) mapistoreMessageClass
+{
+  NSString *className, *mapiMsgClass;
+
+  switch (objectType)
+    {
+    case MAPIMessageCacheObject:
+      mapiMsgClass = [properties
+                       objectForKey: MAPIPropertyKey (PidTagMessageClass)];
+      if (mapiMsgClass)
+        {
+          if ([mapiMsgClass isEqualToString: @"IPM.StickyNote"])
+            className = @"MAPIStoreNotesMessage";
+          else
+            className = @"MAPIStoreDBMessage";
+          //[self logWithFormat: @"PidTagMessageClass = '%@', returning '%@'",
+          //      mapiMsgClass, className];
+        }
+      else
+        {
+          //[self warnWithFormat: @"PidTagMessageClass is not set, falling back"
+          //      @" to 'MAPIStoreDBMessage'"];
+          className = @"MAPIStoreDBMessage";
+        }
+      break;
+    case MAPIFAICacheObject:
+      className = @"MAPIStoreFAIMessage";
+      break;
+    default:
+      [NSException raise: @"MAPIStoreIOException"
+                  format: @"message class should not be queried for objects"
+                   @" of type '%d'", objectType];
+    }
+
+  return NSClassFromString (className);
+}
+
+@end
@@ -1,8 +1,6 @@
 /* SOGoMAPIDBMessage.h - this file is part of SOGo
 *
- * Copyright (C) 2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * 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
@@ -23,12 +21,12 @@
 #ifndef SOGOMAPIDBMESSAGE_H
 #define SOGOMAPIDBMESSAGE_H

-#import "SOGoMAPIDBObject.h"
+#import <SOGo/SOGoCacheGCSObject.h>

@class NSDate;
@class NSString;

-@interface SOGoMAPIDBMessage : SOGoMAPIDBObject
+@interface SOGoMAPIDBMessage : SOGoCacheGCSObject
@end

 #endif /* SOGOMAPIDBMESSAGE_H */