diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 8becc4adb..e463220eb 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1003,7 +1003,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
                [o save];
              } 
-           else
+           else if ([[folders objectAtIndex:fi] isKindOfClass: [SOGoContactGCSFolder class]])
              {
                type = ([[[folders objectAtIndex:fi] nameInContainer] isEqualToString: personalFolderName] ? 9 : 14);
                [commands appendFormat: @"<%@><ServerId>%@</ServerId><ParentId>%@</ParentId><DisplayName>%@</DisplayName><Type>%d</Type></%@>", operation,
diff --git a/ChangeLog b/ChangeLog
index 8d06dd75f..a78b6b1f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+commit 3c063e04fb6943a5716e3978e49e9dcef3660b77
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Wed Dec 10 14:24:06 2014 -0500
+
+    v2.2.11a release + bug fix
+
+M	ActiveSync/SOGoActiveSyncDispatcher.m
+M	NEWS
+
+commit ce5e46f5fb7b1392a0025238b8ac9144bd4d2adb
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Dec 10 09:22:03 2014 -0500
+
+    Remove unused templates from SchedulerUI
+
+M	UI/Scheduler/GNUmakefile
+D	UI/Scheduler/UIxAptTableView.m
+D	UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
+D	UI/Templates/SchedulerUI/UIxAptTableView.wox
+D	UI/Templates/SchedulerUI/UIxTaskProposal.wox
+
+commit 1c0e64f169439f0284a1427043c88d5fcc525455
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Tue Dec 9 09:09:18 2014 -0500
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit aac6b22ab56f594e2c796d015e949549bf22e517
 Author: Ludovic Marcotte <lmarcotte@inverse.ca>
 Date:   Tue Dec 9 09:08:54 2014 -0500
diff --git a/NEWS b/NEWS
index 21a42d621..2b9d9616b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.2.11a (2014-12-10)
+--------------------
+
+Bug fixes
+ - Make sure all address books returned using EAS are GCS ones
+
 2.2.11 (2014-12-09)
 -------------------
 
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index cc574b512..c9c8a38b6 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -23,12 +23,11 @@ SchedulerUI_OBJC_FILES =		\
 	UIxCalFolderActions.m		\
 					\
 	UIxCalView.m			\
-  	UIxCalViewPrint.m 		\
+	UIxCalViewPrint.m 		\
 	UIxCalDayView.m			\
 	UIxCalMulticolumnDayView.m	\
 	UIxCalWeekView.m		\
 	UIxCalMonthView.m		\
-	UIxAptTableView.m		\
 					\
 	UIxCalListingActions.m		\
 	UIxCalMainActions.m		\
diff --git a/UI/Scheduler/UIxAptTableView.m b/UI/Scheduler/UIxAptTableView.m
deleted file mode 100644
index a634f9257..000000000
--- a/UI/Scheduler/UIxAptTableView.m
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-  Copyright (C) 2000-2003 SKYRIX Software AG
-
-  This file is part of OGo
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  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.
-*/
-
-#import <NGObjWeb/SoComponent.h>
-
-@class NSArray, NSCalendarDate;
-
-@interface UIxAptTableView : SoComponent
-{
-  NSArray *appointments;
-  id      appointment;
-}
-
-/* accessors */
-
-- (NSArray *)appointments;
-- (id)appointment;
-
-@end
-
-@implementation UIxAptTableView
-
-- (void)dealloc {
-  [self->appointment  release];
-  [self->appointments release];
-  [super dealloc];
-}
-
-/* accessors */
-
-- (void)setAppointments:(NSArray *)_apts {
-  ASSIGN(self->appointments, _apts);
-}
-- (NSArray *)appointments {
-  return self->appointments;
-}
-
-- (void)setAppointment:(id)_apt {
-  ASSIGN(self->appointment, _apt);
-}
-- (id)appointment {
-  return self->appointment;
-}
-
-- (NSString *)appointmentViewURL {
-  id pkey;
-  
-  if ((pkey = [[self appointment] valueForKey:@"dateId"]) == nil)
-    return nil;
-  
-  return [NSString stringWithFormat:@"%@/view", pkey];
-}
-
-@end /* UIxAptTableView */
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox b/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
deleted file mode 100644
index 6b1df183c..000000000
--- a/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:rsrc="OGo:url"
-               xmlns:uix="OGo:uix"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
->
-  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
-         width="100%"
-  >
-    <tr>
-        <td class="window_label">
-          <var:string label:value="Search appointments" />
-        </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <form var:href="clientObject.baseURL">
-          <table border="0" width="100%" cellspacing="0" cellpadding="4">
-            <tr bgcolor="#e8e8e0">
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Search appointments"/>
-                </span>
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0">
-                <span class="aptview_text">
-                  <var:string label:value="Start date" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <var:component className="UIxDatePickerScript" />
-                  <var:component className="UIxDatePicker"
-                                 const:dateID="startDate"
-                                 day="startDateDay"
-                                 month="startDateMonth"
-                                 year="startDateYear"
-                                 label:label="browse start date"
-                  />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" 
-    class="aptview_text" >
-                <var:string label:value="End date" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                <var:component className="UIxDatePicker"
-                               const:dateID="endDate"
-                               day="endDateDay"
-                               month="endDateMonth"
-                               year="endDateYear"
-                               label:label="browse end date"
-                />
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0"
-                  class="aptview_text"
-              >
-                <var:string label:value="Earliest start time" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                <var:component className="UIxTimeSelector"
-                               const:timeID="earliestStartTime"
-                               hour="startDateHour"
-                               minute="startDateMinute"
-                />
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" 
-    class="aptview_text" >
-                <var:string label:value="Latest end time" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                <var:component className="UIxTimeSelector"
-                               const:timeID="latestEndTime"
-                               hour="endDateHour"
-                               minute="endDateMinute"
-                />
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" 
-    class="aptview_text" >
-                <var:string label:value="Duration" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                <var:popup list="durationSteps" item="item"
-                           string="itemDurationText"
-                           selection="duration" />
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr bgcolor="#e8e8e0">
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Search resources" />
-                </span>
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr valign="top">
-              <td colspan="2">
-                  <var:component className="UIxContactSelector"
-                    const:selectorId="resources" />
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr bgcolor="#e8e8e0">
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Search participants" />
-                </span>
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr valign="top">
-              <td colspan="2">
-                  <var:component className="UIxContactSelector"
-                    const:selectorId="participants" />
-              </td>
-<!--              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  ! use '1' instead of 'YES', otherwise breaks on OSX -->
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr>
-              <td></td>
-              <td>
-                <input type="submit"
-                       label:value="Search"
-                       name="proposalSearch:method"
-                />
-                <span class="button_auto_env"
-                  ><a href="weekoverview"
-                      var:queryDictionary="queryParameters"
-                      class="button_auto"
-                  ><var:string label:value="Cancel" /></a></span>
-              </td>
-            </tr>
-          </table>
-        </form>
-        <hr size="1" noshade="noshade" />
-        <table border="0" cellpadding="0" width="100%" cellspacing="1">
-          <tr>
-            <td align="middle" bgcolor="#FFDAAA" 
-                colspan="1" rowspan="2"> </td>
-            <var:foreach list="hours" item="item">
-              <td colspan="2" align="middle" bgcolor="#FFDAAA">
-                <font color="black" size="2" 
-                      face="Arial,Helvetica,Verdana,Geneva,Tahoma"
-                ><var:string value="item"/></font>
-              </td>
-            </var:foreach>
-          </tr>
-          <tr>
-            <var:foreach list="hours" item="item">
-              <td colspan="1" align="middle" bgcolor="#FFDAAA">
-                <font color="black" size="2" 
-                   face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>
-              </td>
-              <td colspan="1" align="middle" bgcolor="#FFDAAA">
-                <font color="black" size="2" 
-                    face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>
-              </td>
-            </var:foreach>
-          </tr>
-          <var:foreach list="days" item="currentDay">
-            <tr>
-              <td width="15%" align="middle" bgcolor="#FFDAAA" colspan="1">
-                <font color="black" size="2" 
-                      face="Arial,Helvetica,Verdana,Geneva,Tahoma"
-                      ><var:string value="currentDay" 
-                                   label:dateformat="dayLabelFormat" /></font>
-              </td>
-              <var:foreach list="hours" item="item">
-                <var:if condition="isFirstHalfGreen">
-                  <td align="left" bgcolor="#FAE8B8" valign="top">
-                    <a href="new"
-                       var:queryDictionary="currentFirstHalfQueryParameters"
-                    ><img rsrc:src="green_corner.gif" alt="new" 
-                                     border="0" /></a>
-                  </td>
-                </var:if>
-                <var:if condition="isFirstHalfBlocked">
-                  <td align="middle" bgcolor="#FFAAAA" valign="middle">
-                  </td>
-                </var:if>
-                <var:if condition="isSecondHalfGreen">
-                  <td align="left" bgcolor="#FAE8B8" valign="top">
-                    <a href="new"
-                       var:queryDictionary="currentSecondHalfQueryParameters"
-                    ><img rsrc:src="green_corner.gif" alt="new" 
-                                     border="0" /></a>
-                  </td>
-                </var:if>
-                <var:if condition="isSecondHalfBlocked">
-                  <td align="middle" bgcolor="#FFAAAA" valign="middle">
-                  </td>
-                </var:if>
-              </var:foreach>
-            </tr>
-          </var:foreach>
-        </table>
-      </td>
-    </tr>
-  </table>
-</var:component>
diff --git a/UI/Templates/SchedulerUI/UIxAptTableView.wox b/UI/Templates/SchedulerUI/UIxAptTableView.wox
deleted file mode 100644
index ca5b29dad..000000000
--- a/UI/Templates/SchedulerUI/UIxAptTableView.wox
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-<table
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:var="http://www.skyrix.com/od/binding"
-  xmlns:const="http://www.skyrix.com/od/constant">
-  <tr>
-    <th>ID</th>
-    <th>Title</th>
-    <th>Time</th>
-    <th>Version</th>
-    <th>Location</th>
-  </tr>
-  <var:foreach list="appointments" item="appointment">
-    <tr>
-      <td><var:string value="appointment.dateId"/></td>
-      <td>
-        <a var:href="appointmentViewURL"
-          ><var:string value="appointment.title"/></a>
-      </td>
-      <td>
-        <var:string value="appointment.startDate"
-                    const:dateformat="%Y-%m-%d %H:%M" />
-        -
-        <var:string value="appointment.endDate"
-                    const:dateformat="%Y-%m-%d %H:%M" />
-      </td>
-      <td><var:string value="appointment.objectVersion"/></td>
-      <td><var:string value="appointment.location"/></td>
-    </tr>
-  </var:foreach>
-</table>
diff --git a/UI/Templates/SchedulerUI/UIxTaskProposal.wox b/UI/Templates/SchedulerUI/UIxTaskProposal.wox
deleted file mode 100644
index 5b370e115..000000000
--- a/UI/Templates/SchedulerUI/UIxTaskProposal.wox
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:rsrc="OGo:url"
-               xmlns:uix="OGo:uix"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
->
-  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
-         width="100%"
-  >
-    <tr>
-        <td class="window_label">
-          <var:string label:value="Search appointments" />
-        </td>
-    </tr>
-    <tr>
-      <td id="skywinbodycell" class="wincontent">
-        <form var:href="clientObject.baseURL">
-          <table border="0" width="100%" cellspacing="0" cellpadding="4">
-            <tr bgcolor="#e8e8e0">
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Search appointments"/>
-                </span>
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0">
-                <span class="aptview_text">
-                  <var:string label:value="Start date" />:
-                </span>
-              </td>
-              <td align="left" bgcolor="#FFFFF0">
-                <span class="aptview_text">
-                  <var:component className="UIxDatePickerScript" />
-                  <var:component className="UIxDatePicker"
-                                 const:dateID="startDate"
-                                 day="startDateDay"
-                                 month="startDateMonth"
-                                 year="startDateYear"
-                                 label:label="browse start date"
-                  />
-                </span>
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" 
-    class="aptview_text" >
-                <var:string label:value="End date" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                <var:component className="UIxDatePicker"
-                               const:dateID="endDate"
-                               day="endDateDay"
-                               month="endDateMonth"
-                               year="endDateYear"
-                               label:label="browse end date"
-                />
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0"
-                  class="aptview_text"
-              >
-                <var:string label:value="Earliest start time" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text">
-                <var:component className="UIxTimeSelector"
-                               const:timeID="earliestStartTime"
-                               hour="startDateHour"
-                               minute="startDateMinute"
-                />
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" 
-    class="aptview_text" >
-                <var:string label:value="Latest end time" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                <var:component className="UIxTimeSelector"
-                               const:timeID="latestEndTime"
-                               hour="endDateHour"
-                               minute="endDateMinute"
-                />
-              </td>
-            </tr>
-            <tr valign="top">
-              <td align="right" width="15%" bgcolor="#E8E8E0" 
-    class="aptview_text" >
-                <var:string label:value="Duration" />:
-              </td>
-              <td align="left" bgcolor="#FFFFF0" class="aptview_text" >
-                <var:popup list="durationSteps" item="item"
-                           string="itemDurationText"
-                           selection="duration" />
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr bgcolor="#e8e8e0">
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Search resources" />
-                </span>
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr valign="top">
-              <td colspan="2">
-                  <var:component className="UIxContactSelector"
-                    const:selectorId="resources" />
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr bgcolor="#e8e8e0">
-              <td align="left" colspan="2">
-                <span class="aptview_title">
-                  <var:string label:value="Search participants" />
-                </span>
-              </td>
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr valign="top">
-              <td colspan="2">
-                  <var:component className="UIxContactSelector"
-                    const:selectorId="participants" />
-              </td>
-<!--              <td align="left" bgcolor="#FFFFF0"
-                <span class="aptview_text">
-                   use '1' instead of 'YES', otherwise breaks on OSX -->
-            </tr>
-            <tr><td colspan="2"> </td></tr>
-            <tr>
-              <td></td>
-              <td>
-                <input type="submit"
-                       label:value="Search"
-                       name="proposalSearch:method"
-                />
-                <span class="button_auto_env"
-                  ><a href="weekoverview"
-                      var:queryDictionary="queryParameters"
-                      class="button_auto"
-                  ><var:string label:value="Cancel" /></a></span>
-              </td>
-            </tr>
-          </table>
-        </form>
-        <hr size="1" noshade="noshade" />
-        <table border="0" cellpadding="0" width="100%" cellspacing="1">
-          <tr>
-            <td align="middle" bgcolor="#FFDAAA" 
-                colspan="1" rowspan="2"> </td>
-            <var:foreach list="hours" item="item">
-              <td colspan="2" align="middle" bgcolor="#FFDAAA">
-                <font color="black" size="2" 
-                      face="Arial,Helvetica,Verdana,Geneva,Tahoma"
-                ><var:string value="item"/></font>
-              </td>
-            </var:foreach>
-          </tr>
-          <tr>
-            <var:foreach list="hours" item="item">
-              <td colspan="1" align="middle" bgcolor="#FFDAAA">
-                <font color="black" size="2" 
-                   face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>
-              </td>
-              <td colspan="1" align="middle" bgcolor="#FFDAAA">
-                <font color="black" size="2" 
-                    face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>
-              </td>
-            </var:foreach>
-          </tr>
-          <var:foreach list="days" item="currentDay">
-            <tr>
-              <td width="15%" align="middle" bgcolor="#FFDAAA" colspan="1">
-                <font color="black" size="2" 
-                      face="Arial,Helvetica,Verdana,Geneva,Tahoma"
-                      ><var:string value="currentDay" 
-                                   label:dateformat="dayLabelFormat" /></font>
-              </td>
-              <var:foreach list="hours" item="item">
-                <var:if condition="isFirstHalfGreen">
-                  <td align="left" bgcolor="#FAE8B8" valign="top">
-                    <a href="new"
-                       var:queryDictionary="currentFirstHalfQueryParameters"
-                    ><img rsrc:src="green_corner.gif" alt="new" 
-                                     border="0" /></a>
-                  </td>
-                </var:if>
-                <var:if condition="isFirstHalfBlocked">
-                  <td align="middle" bgcolor="#FFAAAA" valign="middle">
-                  </td>
-                </var:if>
-                <var:if condition="isSecondHalfGreen">
-                  <td align="left" bgcolor="#FAE8B8" valign="top">
-                    <a href="new"
-                       var:queryDictionary="currentSecondHalfQueryParameters"
-                    ><img rsrc:src="green_corner.gif" alt="new" 
-                                     border="0" /></a>
-                  </td>
-                </var:if>
-                <var:if condition="isSecondHalfBlocked">
-                  <td align="middle" bgcolor="#FFAAAA" valign="middle">
-                  </td>
-                </var:if>
-              </var:foreach>
-            </tr>
-          </var:foreach>
-        </table>
-      </td>
-    </tr>
-  </table>
-</var:component>